ia64/linux-2.6.18-xen.hg

changeset 478:7e06ed4efc2b

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>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Mar 18 11:18:57 2008 +0000 (2008-03-18)
parents 7a8ac7a685ba
children 32306ea54ae8
files arch/i386/Kconfig arch/i386/kernel/Makefile
line diff
     1.1 --- a/arch/i386/Kconfig	Tue Mar 18 11:18:06 2008 +0000
     1.2 +++ b/arch/i386/Kconfig	Tue Mar 18 11:18:57 2008 +0000
     1.3 @@ -1226,6 +1226,7 @@ config X86_BIOS_REBOOT
     1.4  config X86_TRAMPOLINE
     1.5  	bool
     1.6  	depends on X86_SMP || (X86_VOYAGER && SMP)
     1.7 +	depends on !XEN
     1.8  	default y
     1.9  
    1.10  config X86_NO_TSS
     2.1 --- a/arch/i386/kernel/Makefile	Tue Mar 18 11:18:06 2008 +0000
     2.2 +++ b/arch/i386/kernel/Makefile	Tue Mar 18 11:18:57 2008 +0000
     2.3 @@ -84,5 +84,5 @@ SYSCFLAGS_vsyscall-syms.o = -r
     2.4  early_printk-y            += ../../x86_64/kernel/early_printk.o
     2.5  k8-y                      += ../../x86_64/kernel/k8.o
     2.6  
     2.7 -disabled-obj-$(CONFIG_XEN) := i8259.o reboot.o smpboot.o trampoline.o
     2.8 +disabled-obj-$(CONFIG_XEN) := i8259.o reboot.o smpboot.o
     2.9  %/head.o %/head.s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=