The patch titled
make kernels with CONFIG_X86_GENERIC and !CONFIG_SMP compilable
has been added to the -mm tree. Its filename is
make-kernels-with-config_x86_generic-and-config_smp-compilable.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: make kernels with CONFIG_X86_GENERIC and !CONFIG_SMP compilable
From: Jiri Kosina <jikos@xxxxxxxx>
CONFIG_X86_GENERIC is not exclusively CONFIG_SMP, as mach-default/ could be
compiled also for UP archs. The patch fixes compilation error in
include/asm/mach-summit/mach_apic.h in case CONFIG_X86_GENERIC &&
!CONFIG_SMP
Signed-off-by: Jiri Kosina <jikos@xxxxxxxx>
Acked-by: Keith Mannthey <kmannth@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-i386/smp.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN include/asm-i386/smp.h~make-kernels-with-config_x86_generic-and-config_smp-compilable include/asm-i386/smp.h
--- a/include/asm-i386/smp.h~make-kernels-with-config_x86_generic-and-config_smp-compilable
+++ a/include/asm-i386/smp.h
@@ -46,8 +46,6 @@ extern u8 x86_cpu_to_apicid[];
#define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu]
-extern u8 apicid_2_node[];
-
#ifdef CONFIG_HOTPLUG_CPU
extern void cpu_exit_clear(void);
extern void cpu_uninit(void);
@@ -101,6 +99,9 @@ extern unsigned int num_processors;
#endif
#ifndef __ASSEMBLY__
+
+extern u8 apicid_2_node[];
+
#ifdef CONFIG_X86_LOCAL_APIC
static __inline int logical_smp_processor_id(void)
{
_
Patches currently in -mm which might be from jikos@xxxxxxxx are
make-kernels-with-config_x86_generic-and-config_smp-compilable.patch
git-acpi.patch
acpi-preserve-correct-battery-state-through-suspend-resume-cycles.patch
acpi-preserve-correct-battery-state-through-suspend-resume-cycles-tidy.patch
drivers-base-check-if-device-is-registered-before-removal.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
