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>

1 files changed, 2 insertions, 2 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 = {
         .send_IPI_self                  = NULL,
 
         .wakeup_cpu                     = NULL,
-        .trampoline_phys_low            = TRAMPOLINE_PHYS_LOW,
-        .trampoline_phys_high           = TRAMPOLINE_PHYS_HIGH,
+        .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
+        .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = wait_for_init_deassert,
         .smp_callin_clear_local_apic    = smp_callin_clear_local_apic,
         .store_NMI_vector               = store_NMI_vector,