From: "Jan Beulich" Subject: [PATCH] linux/i386: change the way trampoline.S building is being suppressed Date: Thu, 13 Mar 2008 16:18:58 +0000 Message-ID: <47D96202.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org 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 Index: head-2008-03-11/arch/i386/Kconfig =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 =20 config X86_NO_TSS Index: head-2008-03-11/arch/i386/kernel/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head-2008-03-11.orig/arch/i386/kernel/Makefile +++ head-2008-03-11/arch/i386/kernel/Makefile @@ -84,5 +84,5 @@ early_printk-y +=3D ../../x86_64/kernel/early_printk.o k8-y +=3D ../../x86_64/kernel/k8.o =20 -disabled-obj-$(CONFIG_XEN) :=3D i8259.o reboot.o smpboot.o trampoline.o +disabled-obj-$(CONFIG_XEN) :=3D i8259.o reboot.o smpboot.o %/head.o %/head.s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=3D