Upstream fix for uniprocessor breakage.

(Portage version: 2.0.51.20-r5)

4 files changed, 88 insertions, 14 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index 16437dabbe8f..c7a161fdb2bc 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.222 2005/04/30 14:23:29 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.223 2005/04/30 20:08:09 chainsaw Exp $
+
+  30 Apr 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/2.6.12-rc3-mm1-uniprocessor-fixes.patch,
+  mm-sources-2.6.12_rc3-r1.ebuild:
+  Apply upstream fix for uniprocessor breakage. Will not boot reliably without.
 
 *mm-sources-2.6.12_rc3-r1 (30 Apr 2005)
 
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index a514c8d47f04..56799e40fee9 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 cac9c1545aeb6c06fd7fbbbb6dc097e3 mm-sources-2.6.11-r4.ebuild 1012
 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351
 MD5 d701645d0241d34d6307bb807db2be34 ChangeLog 39759
-MD5 dca53ebb361bf4cea71f668f4b82ad2a mm-sources-2.6.12_rc3-r1.ebuild 1016
+MD5 ece66eda85da5b3a4bbbbd068df24511 mm-sources-2.6.12_rc3-r1.ebuild 1064
 MD5 5b9bbc92fd9dce88ff3369ff203bbf5a mm-sources-2.6.12_rc2-r1.ebuild 1017
 MD5 ddff9dc90892423dec4e6d8e3b34fe2c mm-sources-2.6.11-r3.ebuild 1012
 MD5 8ede9980fafb35fd21413b66a6b9db88 mm-sources-2.6.11-r2.ebuild 1013
@@ -15,10 +12,4 @@ MD5 45444c176e9e9224a66be0ff5055d9b7 files/digest-mm-sources-2.6.11-r4 127
 MD5 352b87022e85a81108ad35f34203550b files/digest-mm-sources-2.6.11-r2 127
 MD5 7427d158ef757af85d04be602905d73d files/digest-mm-sources-2.6.12_rc2-r3 197
 MD5 3b78dd930e187cb1fe6d50d4491987d2 files/digest-mm-sources-2.6.12_rc2-r1 197
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCc5T1p5vW4rUFj5oRAl8jAJ96QbD6bYtMYW6oWGv6qkJqLzSG8QCcCP1V
-VjBQcYjZQW/201rD/bPBa0A=
-=VgCI
------END PGP SIGNATURE-----
+MD5 577afa6b9756ac464c781ff23727e92a files/2.6.12-rc3-mm1-uniprocessor-fixes.patch 2781
diff --git a/sys-kernel/mm-sources/files/2.6.12-rc3-mm1-uniprocessor-fixes.patch b/sys-kernel/mm-sources/files/2.6.12-rc3-mm1-uniprocessor-fixes.patch
new file mode 100644
index 000000000000..4734b906a310
--- /dev/null
+++ b/sys-kernel/mm-sources/files/2.6.12-rc3-mm1-uniprocessor-fixes.patch
@@ -0,0 +1,78 @@
+Thanks, guys.  I seem to have it limping along on UP now, partly with the
+below.
+
+Li, it's a bit awkward to be calling things by hand on SMP and with an
+initcall on UP.  Maybe something neater can be done there.
+
+I quickly tested suspend/resume on UP.  Appears to work.
+
+
+
+ arch/i386/kernel/sysenter.c  |   10 ++++++++++
+ arch/i386/power/cpu.c        |    2 ++
+ include/asm-i386/processor.h |    1 +
+ include/asm-i386/smp.h       |    1 -
+ 4 files changed, 13 insertions(+), 1 deletion(-)
+
+diff -puN arch/i386/kernel/sysenter.c~sep-initializing-rework-fix arch/i386/kernel/sysenter.c
+--- 25/arch/i386/kernel/sysenter.c~sep-initializing-rework-fix	2005-04-30 12:20:20.370077048 -0700
++++ 25-akpm/arch/i386/kernel/sysenter.c	2005-04-30 12:20:20.375076288 -0700
+@@ -65,3 +65,13 @@ int __init sysenter_setup(void)
+ 
+ 	return 0;
+ }
++
++#ifndef CONFIG_SMP
++static int __init sysenter_sep_setup(void)
++{
++	sysenter_setup();
++	enable_sep_cpu();
++	return 0;
++}
++module_init(sysenter_sep_setup);
++#endif
+diff -puN arch/i386/power/cpu.c~sep-initializing-rework-fix arch/i386/power/cpu.c
+--- 25/arch/i386/power/cpu.c~sep-initializing-rework-fix	2005-04-30 12:20:20.371076896 -0700
++++ 25-akpm/arch/i386/power/cpu.c	2005-04-30 12:20:35.890717552 -0700
+@@ -22,9 +22,11 @@
+ #include <linux/device.h>
+ #include <linux/suspend.h>
+ #include <linux/acpi.h>
++
+ #include <asm/uaccess.h>
+ #include <asm/acpi.h>
+ #include <asm/tlbflush.h>
++#include <asm/processor.h>
+ 
+ static struct saved_context saved_context;
+ 
+diff -puN include/asm-i386/processor.h~sep-initializing-rework-fix include/asm-i386/processor.h
+--- 25/include/asm-i386/processor.h~sep-initializing-rework-fix	2005-04-30 12:20:41.633844464 -0700
++++ 25-akpm/include/asm-i386/processor.h	2005-04-30 12:21:04.316396192 -0700
+@@ -691,5 +691,6 @@ extern void select_idle_routine(const st
+ #define cache_line_size() (boot_cpu_data.x86_cache_alignment)
+ 
+ extern unsigned long boot_option_idle_override;
++extern void enable_sep_cpu(void);
+ 
+ #endif /* __ASM_I386_PROCESSOR_H */
+diff -puN include/asm-i386/smp.h~sep-initializing-rework-fix include/asm-i386/smp.h
+--- 25/include/asm-i386/smp.h~sep-initializing-rework-fix	2005-04-30 12:20:45.463262304 -0700
++++ 25-akpm/include/asm-i386/smp.h	2005-04-30 12:20:53.140095248 -0700
+@@ -38,7 +38,6 @@ extern cpumask_t cpu_sibling_map[];
+ extern cpumask_t cpu_core_map[];
+ 
+ extern int sysenter_setup(void);
+-extern void enable_sep_cpu(void);
+ 
+ extern void smp_flush_tlb(void);
+ extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs);
+_
+
+-
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
+
+
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.12_rc3-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.12_rc3-r1.ebuild
index 868ffc97e873..5e1b64549cf8 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.12_rc3-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.12_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.12_rc3-r1.ebuild,v 1.1 2005/04/30 14:23:29 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.12_rc3-r1.ebuild,v 1.2 2005/04/30 20:08:09 chainsaw Exp $
 
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
@@ -8,7 +8,7 @@ UNIPATCH_STRICTORDER="yes"
 ETYPE="sources"
 inherit kernel-2
 detect_version
-UNIPATCH_LIST="${DISTDIR}/${KV_FULL}.bz2"
+UNIPATCH_LIST="${DISTDIR}/${KV_FULL}.bz2 ${FILESDIR}/${KV_FULL}-uniprocessor-fixes.patch"
 K_NOSETEXTRAVERSION="don't_set_it"
 RESTRICT="nomirror"
 DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"