diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-10-03 15:36:51 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-10-03 15:36:51 +0000 |
| commit | 7d5bf87b7801e03136e5d4d58b02ff2ee495633d (patch) | |
| tree | 32fc4807e71fc7490bdcc5ce5aab9df4f0aa8021 /sys-kernel/linux26-headers | |
| parent | Stable on alpha. (Manifest recommit) (diff) | |
| download | gentoo-2-7d5bf87b7801e03136e5d4d58b02ff2ee495633d.tar.gz gentoo-2-7d5bf87b7801e03136e5d4d58b02ff2ee495633d.tar.bz2 gentoo-2-7d5bf87b7801e03136e5d4d58b02ff2ee495633d.zip | |
PPC64: Fixing pte_t conflict when __KERNEL__ is defined.
Diffstat (limited to 'sys-kernel/linux26-headers')
| -rw-r--r-- | sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch index 4b768cf94c48..02c251e7f45e 100644 --- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch +++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch @@ -1616,16 +1616,20 @@ diff -ur linux-2.6.8.1/include/asm-ppc64/spinlock.h linux-2.6.8.1-gentoo/include diff -ur linux-2.6.8.1/include/asm-ppc64/page.h linux-2.6.8.1-gentoo/include/asm-ppc64/page.h --- linux-2.6.8.1/include/asm-ppc64/page.h 2004-07-10 01:47:34.000000000 +0100 +++ linux-2.6.8.1-gentoo/include/asm-ppc64/page.h 2004-10-03 14:09:31.434460808 +0100 -@@ -90,6 +91,8 @@ +@@ -91,6 +91,12 @@ /* to align the pointer to the (next) page boundary */ #define PAGE_ALIGN(addr) _ALIGN(addr, PAGE_SIZE) ++#ifdef STRICT_MM_TYPECHECKS +typedef struct { unsigned long pte; } pte_t; ++#else ++typedef unsigned long pte_t; ++#endif + #ifdef __KERNEL__ #ifndef __ASSEMBLY__ #include <asm/naca.h> -@@ -128,7 +131,6 @@ +@@ -129,7 +135,6 @@ * These are used to make use of C type-checking. * Entries in the pte table are 64b, while entries in the pgd & pmd are 32b. */ @@ -1633,3 +1637,11 @@ diff -ur linux-2.6.8.1/include/asm-ppc64/page.h linux-2.6.8.1-gentoo/include/asm typedef struct { unsigned int pmd; } pmd_t; typedef struct { unsigned int pgd; } pgd_t; typedef struct { unsigned long pgprot; } pgprot_t; +@@ -148,7 +153,6 @@ + /* + * .. while these make it easier on the compiler + */ +-typedef unsigned long pte_t; + typedef unsigned int pmd_t; + typedef unsigned int pgd_t; + typedef unsigned long pgprot_t; |