Added a patch from iluxa that moves an include of asm/spaces.h in asm/page.h into kernel space so userland programs don't get messed up.

4 files changed, 32 insertions, 4 deletions

diff --git a/sys-kernel/mips-headers/ChangeLog b/sys-kernel/mips-headers/ChangeLog
index 3354e2431b27..5f51603d5a2b 100644
--- a/sys-kernel/mips-headers/ChangeLog
+++ b/sys-kernel/mips-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/mips-headers
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.18 2004/06/05 07:58:55 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.19 2004/06/07 04:39:28 kumba Exp $
+
+  07 Jun 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/mips-headers-2.6.6-spaces_h-kernel.patch, mips-headers-2.6.6.ebuild:
+  Added a patch from iluxa that moves an include of asm/spaces.h in asm/pages.h
+  into kernel space so userland programs don't get messed up.
 
 *mips-headers-2.6.6 (05 Jun 2004)
 
diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index 3d4b332b53d1..1dd8e30fe995 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,4 +1,4 @@
-MD5 3c5c1dc4175fa001e997667206aae527 ChangeLog 4415
+MD5 c7987d5320dbd6e1e0ef72102e804c33 ChangeLog 4678
 MD5 a79e966514d7aa3b003e25a207766f97 metadata.xml 417
 MD5 198cfa1ae2c6331048208eee050a3a64 mips-headers-2.4.21-r1.ebuild 1353
 MD5 6d2d5da4ac71dd14f469ec80e96cd06a mips-headers-2.4.21-r2.ebuild 1255
@@ -6,7 +6,7 @@ MD5 f34d6670a6ee7d3006091b9aee1ad5e4 mips-headers-2.4.21-r3.ebuild 1447
 MD5 8e11ed16c433664407777578f9ee5fb8 mips-headers-2.4.22-r1.ebuild 1920
 MD5 73ad9be0743e66deb208c4d0f18ed355 mips-headers-2.4.23.ebuild 1715
 MD5 52d19642fdad149f8b07bbe1b52e5ad0 mips-headers-2.4.25.ebuild 1715
-MD5 397c23b0f305a30742ce5755a7ac2357 mips-headers-2.6.6.ebuild 3073
+MD5 d1faa2631a69885a57d444a1e7ae3bf0 mips-headers-2.6.6.ebuild 3128
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 747353be86040c7e4c49b553f3467b7c files/digest-mips-headers-2.4.21-r1 160
 MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-headers-2.4.21-r2 145
@@ -21,3 +21,4 @@ MD5 a73786f0b9dda7e9ebacb91a192384f9 files/mips-headers-2.6.0-sysctl_h-compat.pa
 MD5 598136365858338b26557b7587c6725f files/mips-headers-2.6.3-strict-ansi-fix.patch 4166
 MD5 cb8280b584baf48a15e342e96099eeb9 files/mips-headers-2.6.6-appCompat.patch 26265
 MD5 47f57c5b40dfb04d3bdbc16989a2d151 files/digest-mips-headers-2.6.6 142
+MD5 a9f74b71da391afa8399922824c8fc72 files/mips-headers-2.6.6-spaces_h-kernel.patch 498
diff --git a/sys-kernel/mips-headers/files/mips-headers-2.6.6-spaces_h-kernel.patch b/sys-kernel/mips-headers/files/mips-headers-2.6.6-spaces_h-kernel.patch
new file mode 100644
index 000000000000..951e9b6d88bb
--- /dev/null
+++ b/sys-kernel/mips-headers/files/mips-headers-2.6.6-spaces_h-kernel.patch
@@ -0,0 +1,20 @@
+Index: include/asm-mips/page.h
+===================================================================
+RCS file: /home/cvs/linux/include/asm-mips/page.h,v
+retrieving revision 1.41
+diff -u -r1.41 page.h
+--- include/asm-mips/page.h	18 Mar 2004 22:54:01 -0000	1.41
++++ include/asm-mips/page.h	7 Jun 2004 04:19:34 -0000
+@@ -10,10 +10,11 @@
+ #define _ASM_PAGE_H
+ 
+ #include <linux/config.h>
+-#include <spaces.h>
+ 
+ #ifdef __KERNEL__
+ 
++#include <spaces.h>
++
+ /*
+  * PAGE_SHIFT determines the page size
+  */
diff --git a/sys-kernel/mips-headers/mips-headers-2.6.6.ebuild b/sys-kernel/mips-headers/mips-headers-2.6.6.ebuild
index 06477d900428..610b6fb5a291 100644
--- a/sys-kernel/mips-headers/mips-headers-2.6.6.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.6.6.ebuild,v 1.1 2004/06/05 07:58:55 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.6.6.ebuild,v 1.2 2004/06/07 04:39:28 kumba Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -52,6 +52,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.6.3-strict-ansi-fix.patch
 	epatch ${FILESDIR}/${PN}-2.6.0-sysctl_h-compat.patch
 	epatch ${FILESDIR}/${PN}-2.6.0-fb.patch
+
+	epatch ${FILESDIR}/${PN}-2.6.6-spaces_h-kernel.patch
 }
 
 src_compile() {