[Xen-devel] [PATCH] linux/i386: change the way trampoline.S building is being suppressed

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

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

As usual, written and tested on 2.6.25-rc5 and made apply to the 2.6.18
tree without further testing.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: head-2008-03-11/arch/i386/Kconfig
===================================================================
--- head-2008-03-11.orig/arch/i386/Kconfig
+++ head-2008-03-11/arch/i386/Kconfig
@@ -1225,6 +1225,7 @@
 config X86_TRAMPOLINE
        bool
        depends on X86_SMP || (X86_VOYAGER && SMP)
+       depends on !XEN
        default y
 
 config X86_NO_TSS
Index: head-2008-03-11/arch/i386/kernel/Makefile
===================================================================
--- head-2008-03-11.orig/arch/i386/kernel/Makefile
+++ head-2008-03-11/arch/i386/kernel/Makefile
@@ -84,5 +84,5 @@
 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) :=




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel