WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

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

To: <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH] linux/i386: change the way trampoline.S building is being suppressed
From: "Jan Beulich" <jbeulich@xxxxxxxxxx>
Date: Thu, 13 Mar 2008 16:18:58 +0000
Delivery-date: Thu, 13 Mar 2008 09:18:33 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-devel] [PATCH] linux/i386: change the way trampoline.S building is being suppressed, Jan Beulich <=