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 | fe7137f562201a80f15b1c381447e60e5b285e6f (patch) | |
| tree | d293444ed42290c5babdd29d42e62055676ad519 /sys-kernel | |
| parent | Stable on alpha. (diff) | |
| download | historical-fe7137f562201a80f15b1c381447e60e5b285e6f.tar.gz historical-fe7137f562201a80f15b1c381447e60e5b285e6f.tar.bz2 historical-fe7137f562201a80f15b1c381447e60e5b285e6f.zip | |
PPC64: Fixing pte_t conflict when __KERNEL__ is defined.
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/linux26-headers/Manifest | 2 | ||||
| -rw-r--r-- | sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest index c0c37b0a6aec..71741d543b33 100644 --- a/sys-kernel/linux26-headers/Manifest +++ b/sys-kernel/linux26-headers/Manifest @@ -18,7 +18,7 @@ MD5 18bed04a1b45de515096089cc10913ec files/digest-linux26-headers-2.6.8.1-r1 68 MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386 MD5 8fbc202526e4c1b1672c5274bbff4e5f files/linux26-headers-2.6.6-appCompat.patch 26689 MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240 -MD5 2417a15b89a123a4dbf2bc857406f6bb files/linux26-headers-2.6.8.1-appCompat.patch 51588 +MD5 a7fc9c7093167bfa5e435df748e0cce5 files/linux26-headers-2.6.8.1-appCompat.patch 51865 MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r4 66 MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-backport.patch 288 MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66 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; |