From 042623bbabae168246ad8a37693f0ecb6c450aea Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 25 Jun 2008 19:52:15 -0700 Subject: x86: clean up ARCH_SETUP asm-x86/paravirt.h already have protection with CONFIG_PARAVIRT inside Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar --- arch/x86/kernel/setup.c | 8 ++++---- include/asm-x86/mach-default/setup_arch.h | 4 ---- include/asm-x86/mach-visws/setup_arch.h | 2 -- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 63dbb5e8f7e..161609c6925 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -101,11 +101,7 @@ #include #include -#ifdef CONFIG_PARAVIRT #include -#else -#define ARCH_SETUP -#endif #include #include @@ -115,6 +111,10 @@ #include #endif +#ifndef ARCH_SETUP +#define ARCH_SETUP +#endif + #ifndef CONFIG_DEBUG_BOOT_PARAMS struct boot_params __initdata boot_params; #else diff --git a/include/asm-x86/mach-default/setup_arch.h b/include/asm-x86/mach-default/setup_arch.h index 605e3ccb991..38846208b54 100644 --- a/include/asm-x86/mach-default/setup_arch.h +++ b/include/asm-x86/mach-default/setup_arch.h @@ -1,7 +1,3 @@ /* Hook to call BIOS initialisation function */ /* no action for generic */ - -#ifndef ARCH_SETUP -#define ARCH_SETUP -#endif diff --git a/include/asm-x86/mach-visws/setup_arch.h b/include/asm-x86/mach-visws/setup_arch.h index 33f700ef683..b8f5dd829db 100644 --- a/include/asm-x86/mach-visws/setup_arch.h +++ b/include/asm-x86/mach-visws/setup_arch.h @@ -4,5 +4,3 @@ extern unsigned long sgivwfb_mem_phys; extern unsigned long sgivwfb_mem_size; /* no action for visws */ - -#define ARCH_SETUP -- cgit v1.2.3