aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-25 22:52:15 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 07:16:00 -0400
commit042623bbabae168246ad8a37693f0ecb6c450aea (patch)
tree23d2738e60abb8615b96e026c4c16604aa0e73d7
parent611dfd7819e525b45f39ff15e0faf5f23551c113 (diff)
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.c8
-rw-r--r--include/asm-x86/mach-default/setup_arch.h4
-rw-r--r--include/asm-x86/mach-visws/setup_arch.h2
3 files changed, 4 insertions, 10 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 63dbb5e8f7ee..161609c6925e 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -101,11 +101,7 @@
101#include <asm/proto.h> 101#include <asm/proto.h>
102 102
103#include <mach_apic.h> 103#include <mach_apic.h>
104#ifdef CONFIG_PARAVIRT
105#include <asm/paravirt.h> 104#include <asm/paravirt.h>
106#else
107#define ARCH_SETUP
108#endif
109 105
110#include <asm/percpu.h> 106#include <asm/percpu.h>
111#include <asm/sections.h> 107#include <asm/sections.h>
@@ -115,6 +111,10 @@
115#include <asm/numa_64.h> 111#include <asm/numa_64.h>
116#endif 112#endif
117 113
114#ifndef ARCH_SETUP
115#define ARCH_SETUP
116#endif
117
118#ifndef CONFIG_DEBUG_BOOT_PARAMS 118#ifndef CONFIG_DEBUG_BOOT_PARAMS
119struct boot_params __initdata boot_params; 119struct boot_params __initdata boot_params;
120#else 120#else
diff --git a/include/asm-x86/mach-default/setup_arch.h b/include/asm-x86/mach-default/setup_arch.h
index 605e3ccb991b..38846208b548 100644
--- a/include/asm-x86/mach-default/setup_arch.h
+++ b/include/asm-x86/mach-default/setup_arch.h
@@ -1,7 +1,3 @@
1/* Hook to call BIOS initialisation function */ 1/* Hook to call BIOS initialisation function */
2 2
3/* no action for generic */ 3/* no action for generic */
4
5#ifndef ARCH_SETUP
6#define ARCH_SETUP
7#endif
diff --git a/include/asm-x86/mach-visws/setup_arch.h b/include/asm-x86/mach-visws/setup_arch.h
index 33f700ef6831..b8f5dd829dba 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;
4extern unsigned long sgivwfb_mem_size; 4extern unsigned long sgivwfb_mem_size;
5 5
6/* no action for visws */ 6/* no action for visws */
7
8#define ARCH_SETUP