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-changelog

[Xen-changelog] [linux-2.6.18-xen] xen/i386: change the way trampoline.S

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [linux-2.6.18-xen] xen/i386: change the way trampoline.S building is suppressed
From: "Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 20 Mar 2008 05:41:26 -0700
Delivery-date: Thu, 20 Mar 2008 05:47:16 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1205839137 0
# Node ID 7e06ed4efc2b2d2481a880f1c7b5885a82a34d2b
# Parent  7a8ac7a685ba6a24ad24d459e2717f165febbbaa
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@xxxxxxxxxx>
---
 arch/i386/Kconfig         |    1 +
 arch/i386/kernel/Makefile |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff -r 7a8ac7a685ba -r 7e06ed4efc2b arch/i386/Kconfig
--- a/arch/i386/Kconfig Tue Mar 18 11:18:06 2008 +0000
+++ b/arch/i386/Kconfig Tue Mar 18 11:18:57 2008 +0000
@@ -1226,6 +1226,7 @@ config X86_TRAMPOLINE
 config X86_TRAMPOLINE
        bool
        depends on X86_SMP || (X86_VOYAGER && SMP)
+       depends on !XEN
        default y
 
 config X86_NO_TSS
diff -r 7a8ac7a685ba -r 7e06ed4efc2b arch/i386/kernel/Makefile
--- a/arch/i386/kernel/Makefile Tue Mar 18 11:18:06 2008 +0000
+++ b/arch/i386/kernel/Makefile Tue Mar 18 11:18:57 2008 +0000
@@ -84,5 +84,5 @@ early_printk-y            += ../../x86_6
 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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [linux-2.6.18-xen] xen/i386: change the way trampoline.S building is suppressed, Xen patchbot-linux-2.6.18-xen <=