xen/i386: change the way trampoline.S building is suppressed

Instead of using the disabled-obj-$() mechanism, preventing
trampoline.S from being built can be done simply be adding a config
option dependency.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index cc63f08909c03083410752506629a0c19897ac61..a8dc350bbe4fbf9fc844c2c06a27c43fb59d1a18 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1226,6 +1226,7 @@ config X86_BIOS_REBOOT
 config X86_TRAMPOLINE
        bool
        depends on X86_SMP || (X86_VOYAGER && SMP)
+       depends on !XEN
        default y
 
 config X86_NO_TSS

diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 72ee0a114a8585428c9ad80d2a3045bd41c1f9e3..eff6c2074bbc4e0ab7ac61c018c502f08af288fd 100644 (file)
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -84,5 +84,5 @@ $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
 early_printk-y            += ../../x86_64/kernel/early_printk.o
 k8-y                      += ../../x86_64/kernel/k8.o
 
-disabled-obj-$(CONFIG_XEN) := i8259.o reboot.o smpboot.o trampoline.o
+disabled-obj-$(CONFIG_XEN) := i8259.o reboot.o smpboot.o
 %/head.o %/head.s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=