diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 09:05:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 09:05:35 -0700 |
| commit | d9089c296bdd82e6c1b7f82d04c11b5decde75e7 (patch) | |
| tree | 6c2a3b8bc1b6f8b5930f6a20b099511dd19aa4ba /include/asm-powerpc/pgtable-64k.h | |
| parent | bda426f5310ffddcd463fe20f352609e84989514 (diff) | |
| parent | 00df438e89a9003895948170e1abf64dd4665872 (diff) | |
| download | kernel_samsung_smdk4412-d9089c296bdd82e6c1b7f82d04c11b5decde75e7.tar.gz kernel_samsung_smdk4412-d9089c296bdd82e6c1b7f82d04c11b5decde75e7.tar.bz2 kernel_samsung_smdk4412-d9089c296bdd82e6c1b7f82d04c11b5decde75e7.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (25 commits)
powerpc: Disable 64K hugetlb support when doing 64K SPU mappings
powerpc/powermac: Fixup default serial port device for pmac_zilog
powerpc/powermac: Use sane default baudrate for SCC debugging
powerpc/mm: Implement _PAGE_SPECIAL & pte_special() for 64-bit
powerpc: Show processor cache information in sysfs
powerpc: Make core id information available to userspace
powerpc: Make core sibling information available to userspace
powerpc/vio: More fallout from dma_mapping_error API change
ibmveth: Fix multiple errors with dma_mapping_error conversion
powerpc/pseries: Fix CMO sysdev attribute API change fallout
powerpc: Enable tracehook for the architecture
powerpc: Add TIF_NOTIFY_RESUME support for tracehook
powerpc: Add asm/syscall.h with the tracehook entry points
powerpc: Make syscall tracing use tracehook.h helpers
powerpc: Call tracehook_signal_handler() when setting up signal frames
powerpc: Update cpu_sibling_maps dynamically
powerpc: register_cpu_online should be __cpuinit
powerpc: kill useless SMT code in prom_hold_cpus
powerpc: Fix 8xx build failure
powerpc: Fix vio build warnings
...
Diffstat (limited to 'include/asm-powerpc/pgtable-64k.h')
| -rw-r--r-- | include/asm-powerpc/pgtable-64k.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/pgtable-64k.h b/include/asm-powerpc/pgtable-64k.h index 7e54adb3559..07b0d8f09cb 100644 --- a/include/asm-powerpc/pgtable-64k.h +++ b/include/asm-powerpc/pgtable-64k.h @@ -70,6 +70,8 @@ static inline struct subpage_prot_table *pgd_subpage_prot(pgd_t *pgd) #define PGDIR_MASK (~(PGDIR_SIZE-1)) /* Additional PTE bits (don't change without checking asm in hash_low.S) */ +#define __HAVE_ARCH_PTE_SPECIAL +#define _PAGE_SPECIAL 0x00000400 /* software: special page */ #define _PAGE_HPTE_SUB 0x0ffff000 /* combo only: sub pages HPTE bits */ #define _PAGE_HPTE_SUB0 0x08000000 /* combo only: first sub page */ #define _PAGE_COMBO 0x10000000 /* this is a combo 4k page */ |