diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-25 19:52:15 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 13:16:00 +0200 |
| commit | 042623bbabae168246ad8a37693f0ecb6c450aea (patch) | |
| tree | 23d2738e60abb8615b96e026c4c16604aa0e73d7 | |
| parent | 611dfd7819e525b45f39ff15e0faf5f23551c113 (diff) | |
| download | linux-3.10-042623bbabae168246ad8a37693f0ecb6c450aea.tar.gz linux-3.10-042623bbabae168246ad8a37693f0ecb6c450aea.tar.bz2 linux-3.10-042623bbabae168246ad8a37693f0ecb6c450aea.zip | |
x86: clean up ARCH_SETUP
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>
| -rw-r--r-- | arch/x86/kernel/setup.c | 8 | ||||
| -rw-r--r-- | include/asm-x86/mach-default/setup_arch.h | 4 | ||||
| -rw-r--r-- | 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 <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> @@ -115,6 +111,10 @@ #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 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 |