diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 10:09:23 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:20:31 -0500 |
commit | 6f177c01db6b865181fbc6c948381b290ee09718 (patch) | |
tree | 6fe3dd753a9a8ba99c42452ef9cd9d98bee4315b /arch/x86/mach-generic | |
parent | dac5f4121df3c39fdb2ea57acd669a0ae19e46f8 (diff) |
x86, smp: clean up ->trampoline_phys_low/high handling
- spread out the namespace on a per apic driver basis
- remove wrapper macros
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mach-generic')
-rw-r--r-- | arch/x86/mach-generic/bigsmp.c | 4 | ||||
-rw-r--r-- | arch/x86/mach-generic/default.c | 4 | ||||
-rw-r--r-- | arch/x86/mach-generic/es7000.c | 4 | ||||
-rw-r--r-- | arch/x86/mach-generic/numaq.c | 4 | ||||
-rw-r--r-- | arch/x86/mach-generic/summit.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c index 4782b5547881..a317fbe07fdf 100644 --- a/arch/x86/mach-generic/bigsmp.c +++ b/arch/x86/mach-generic/bigsmp.c | |||
@@ -104,8 +104,8 @@ struct genapic apic_bigsmp = { | |||
104 | .send_IPI_self = NULL, | 104 | .send_IPI_self = NULL, |
105 | 105 | ||
106 | .wakeup_cpu = NULL, | 106 | .wakeup_cpu = NULL, |
107 | .trampoline_phys_low = TRAMPOLINE_PHYS_LOW, | 107 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, |
108 | .trampoline_phys_high = TRAMPOLINE_PHYS_HIGH, | 108 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, |
109 | .wait_for_init_deassert = wait_for_init_deassert, | 109 | .wait_for_init_deassert = wait_for_init_deassert, |
110 | .smp_callin_clear_local_apic = smp_callin_clear_local_apic, | 110 | .smp_callin_clear_local_apic = smp_callin_clear_local_apic, |
111 | .store_NMI_vector = store_NMI_vector, | 111 | .store_NMI_vector = store_NMI_vector, |
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c index bf4670db25fe..17d8f9c22180 100644 --- a/arch/x86/mach-generic/default.c +++ b/arch/x86/mach-generic/default.c | |||
@@ -85,8 +85,8 @@ struct genapic apic_default = { | |||
85 | .send_IPI_self = NULL, | 85 | .send_IPI_self = NULL, |
86 | 86 | ||
87 | .wakeup_cpu = NULL, | 87 | .wakeup_cpu = NULL, |
88 | .trampoline_phys_low = TRAMPOLINE_PHYS_LOW, | 88 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, |
89 | .trampoline_phys_high = TRAMPOLINE_PHYS_HIGH, | 89 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, |
90 | .wait_for_init_deassert = wait_for_init_deassert, | 90 | .wait_for_init_deassert = wait_for_init_deassert, |
91 | .smp_callin_clear_local_apic = smp_callin_clear_local_apic, | 91 | .smp_callin_clear_local_apic = smp_callin_clear_local_apic, |
92 | .store_NMI_vector = store_NMI_vector, | 92 | .store_NMI_vector = store_NMI_vector, |
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c index d36642e6d908..871e85445e21 100644 --- a/arch/x86/mach-generic/es7000.c +++ b/arch/x86/mach-generic/es7000.c | |||
@@ -140,8 +140,8 @@ struct genapic apic_es7000 = { | |||
140 | .send_IPI_self = NULL, | 140 | .send_IPI_self = NULL, |
141 | 141 | ||
142 | .wakeup_cpu = NULL, | 142 | .wakeup_cpu = NULL, |
143 | .trampoline_phys_low = TRAMPOLINE_PHYS_LOW, | 143 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, |
144 | .trampoline_phys_high = TRAMPOLINE_PHYS_HIGH, | 144 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, |
145 | .wait_for_init_deassert = wait_for_init_deassert, | 145 | .wait_for_init_deassert = wait_for_init_deassert, |
146 | .smp_callin_clear_local_apic = smp_callin_clear_local_apic, | 146 | .smp_callin_clear_local_apic = smp_callin_clear_local_apic, |
147 | .store_NMI_vector = store_NMI_vector, | 147 | .store_NMI_vector = store_NMI_vector, |
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c index 135b1832ad80..0b496ab5450c 100644 --- a/arch/x86/mach-generic/numaq.c +++ b/arch/x86/mach-generic/numaq.c | |||
@@ -104,8 +104,8 @@ struct genapic apic_numaq = { | |||
104 | .send_IPI_self = NULL, | 104 | .send_IPI_self = NULL, |
105 | 105 | ||
106 | .wakeup_cpu = NULL, | 106 | .wakeup_cpu = NULL, |
107 | .trampoline_phys_low = TRAMPOLINE_PHYS_LOW, | 107 | .trampoline_phys_low = NUMAQ_TRAMPOLINE_PHYS_LOW, |
108 | .trampoline_phys_high = TRAMPOLINE_PHYS_HIGH, | 108 | .trampoline_phys_high = NUMAQ_TRAMPOLINE_PHYS_HIGH, |
109 | .wait_for_init_deassert = wait_for_init_deassert, | 109 | .wait_for_init_deassert = wait_for_init_deassert, |
110 | .smp_callin_clear_local_apic = smp_callin_clear_local_apic, | 110 | .smp_callin_clear_local_apic = smp_callin_clear_local_apic, |
111 | .store_NMI_vector = store_NMI_vector, | 111 | .store_NMI_vector = store_NMI_vector, |
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c index 77196a4a9d2b..c4799cd34592 100644 --- a/arch/x86/mach-generic/summit.c +++ b/arch/x86/mach-generic/summit.c | |||
@@ -84,8 +84,8 @@ struct genapic apic_summit = { | |||
84 | .send_IPI_self = NULL, | 84 | .send_IPI_self = NULL, |
85 | 85 | ||
86 | .wakeup_cpu = NULL, | 86 | .wakeup_cpu = NULL, |
87 | .trampoline_phys_low = TRAMPOLINE_PHYS_LOW, | 87 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, |
88 | .trampoline_phys_high = TRAMPOLINE_PHYS_HIGH, | 88 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, |
89 | .wait_for_init_deassert = wait_for_init_deassert, | 89 | .wait_for_init_deassert = wait_for_init_deassert, |
90 | .smp_callin_clear_local_apic = smp_callin_clear_local_apic, | 90 | .smp_callin_clear_local_apic = smp_callin_clear_local_apic, |
91 | .store_NMI_vector = store_NMI_vector, | 91 | .store_NMI_vector = store_NMI_vector, |