x86: clean up ARCH_SETUP
authorYinghai Lu <yhlu.kernel@gmail.com>
Thu, 26 Jun 2008 02:52:15 +0000 (19:52 -0700)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 11:16:00 +0000 (13:16 +0200)
asm-x86/paravirt.h already have protection with CONFIG_PARAVIRT inside

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/setup.c
include/asm-x86/mach-default/setup_arch.h
include/asm-x86/mach-visws/setup_arch.h

index 63dbb5e8f7ee902f5b28f9390f65fe6109da2045..161609c6925eaa3ac354eeb31ecc9f7182633b2d 100644 (file)
 #include <asm/proto.h>
 
 #include <mach_apic.h>
-#ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
-#else
-#define ARCH_SETUP
-#endif
 
 #include <asm/percpu.h>
 #include <asm/sections.h>
 #include <asm/numa_64.h>
 #endif
 
+#ifndef ARCH_SETUP
+#define ARCH_SETUP
+#endif
+
 #ifndef CONFIG_DEBUG_BOOT_PARAMS
 struct boot_params __initdata boot_params;
 #else
index 605e3ccb991bde9af67cda27af76fe8fc12b4fb9..38846208b548dc0681498484f585c0da99c3a471 100644 (file)
@@ -1,7 +1,3 @@
 /* Hook to call BIOS initialisation function */
 
 /* no action for generic */
-
-#ifndef ARCH_SETUP
-#define ARCH_SETUP
-#endif
index 33f700ef68316048cdb049f436d187d57854295a..b8f5dd829dba924785aa3f7b5ed20351e3a6b786 100644 (file)
@@ -4,5 +4,3 @@ extern unsigned long sgivwfb_mem_phys;
 extern unsigned long sgivwfb_mem_size;
 
 /* no action for visws */
-
-#define ARCH_SETUP