[Xen-changelog] [xen-unstable] xen/common/Makefile: introduce HAS_{CPUFREQ, PCI, PASSTHROUGH, NS16550, KEXEC}

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
# Date 1328787208 0
# Node ID fe7338e04b37f467a4a8bb773de5f66fcaa90778
# Parent  004a886b35d81330ca4e6c582727193fc0fdf2aa
xen/common/Makefile: introduce HAS_{CPUFREQ,PCI,PASSTHROUGH,NS16550,KEXEC}

- make the compilation of ns16550.c depend upon HAS_NS16550;

- make the compilation of cpufreq depend upon HAS_CPUFREQ;

- make the compilation of pci depend upon HAS_PCI;

- make the compilation of passthrough depend upon HAS_PASSTHROUGH;

- make the compilation of kexec depend upon HAS_KEXEC.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r 004a886b35d8 -r fe7338e04b37 xen/arch/ia64/Rules.mk
--- a/xen/arch/ia64/Rules.mk    Thu Feb 09 12:07:39 2012 +0100
+++ b/xen/arch/ia64/Rules.mk    Thu Feb 09 11:33:28 2012 +0000
@@ -4,6 +4,11 @@
 ia64 := y
 HAS_ACPI := y
 HAS_VGA  := y
+HAS_CPUFREQ := y
+HAS_PCI := y
+HAS_PASSTHROUGH := y
+HAS_NS16550 := y
+HAS_KEXEC := y
 xenoprof := y
 no_warns ?= n
 vti_debug ?= n
diff -r 004a886b35d8 -r fe7338e04b37 xen/arch/x86/Rules.mk
--- a/xen/arch/x86/Rules.mk     Thu Feb 09 12:07:39 2012 +0100
+++ b/xen/arch/x86/Rules.mk     Thu Feb 09 11:33:28 2012 +0000
@@ -3,6 +3,11 @@
 
 HAS_ACPI := y
 HAS_VGA  := y
+HAS_CPUFREQ := y
+HAS_PCI := y
+HAS_PASSTHROUGH := y
+HAS_NS16550 := y
+HAS_KEXEC := y
 xenoprof := y
 
 #
diff -r 004a886b35d8 -r fe7338e04b37 xen/common/Makefile
--- a/xen/common/Makefile       Thu Feb 09 12:07:39 2012 +0100
+++ b/xen/common/Makefile       Thu Feb 09 11:33:28 2012 +0000
@@ -8,7 +8,7 @@
 obj-y += irq.o
 obj-y += kernel.o
 obj-y += keyhandler.o
-obj-y += kexec.o
+obj-$(HAS_KEXEC) += kexec.o
 obj-y += lib.o
 obj-y += memory.o
 obj-y += multicall.o
diff -r 004a886b35d8 -r fe7338e04b37 xen/common/shutdown.c
--- a/xen/common/shutdown.c     Thu Feb 09 12:07:39 2012 +0100
+++ b/xen/common/shutdown.c     Thu Feb 09 11:33:28 2012 +0000
@@ -6,7 +6,9 @@
 #include <xen/delay.h>
 #include <xen/shutdown.h>
 #include <xen/console.h>
+#ifdef CONFIG_KEXEC
 #include <xen/kexec.h>
+#endif
 #include <asm/debugger.h>
 #include <public/sched.h>
 
@@ -58,7 +60,9 @@
     case SHUTDOWN_watchdog:
     {
         printk("Domain 0 shutdown: watchdog rebooting machine.\n");
+#ifdef CONFIG_KEXEC
         kexec_crash();
+#endif
         machine_restart(0);
         break; /* not reached */
     }
diff -r 004a886b35d8 -r fe7338e04b37 xen/drivers/Makefile
--- a/xen/drivers/Makefile      Thu Feb 09 12:07:39 2012 +0100
+++ b/xen/drivers/Makefile      Thu Feb 09 11:33:28 2012 +0000
@@ -1,6 +1,6 @@
 subdir-y += char
-subdir-y += cpufreq
-subdir-y += pci
-subdir-y += passthrough
+subdir-$(HAS_CPUFREQ) += cpufreq
+subdir-$(HAS_PCI) += pci
+subdir-$(HAS_PASSTHROUGH) += passthrough
 subdir-$(HAS_ACPI) += acpi
 subdir-$(HAS_VGA) += video
diff -r 004a886b35d8 -r fe7338e04b37 xen/drivers/char/Makefile
--- a/xen/drivers/char/Makefile Thu Feb 09 12:07:39 2012 +0100
+++ b/xen/drivers/char/Makefile Thu Feb 09 11:33:28 2012 +0000
@@ -1,3 +1,3 @@
 obj-y += console.o
-obj-y += ns16550.o
+obj-$(HAS_NS16550) += ns16550.o
 obj-y += serial.o
diff -r 004a886b35d8 -r fe7338e04b37 xen/drivers/char/console.c
--- a/xen/drivers/char/console.c        Thu Feb 09 12:07:39 2012 +0100
+++ b/xen/drivers/char/console.c        Thu Feb 09 11:33:28 2012 +0000
@@ -22,7 +22,9 @@
 #include <xen/guest_access.h>
 #include <xen/shutdown.h>
 #include <xen/vga.h>
+#ifdef CONFIG_KEXEC
 #include <xen/kexec.h>
+#endif
 #include <asm/debugger.h>
 #include <asm/div64.h>
 #include <xen/hypercall.h> /* for do_console_io */
@@ -963,7 +965,9 @@
 
     debugger_trap_immediate();
 
+#ifdef CONFIG_KEXEC
     kexec_crash();
+#endif
 
     if ( opt_noreboot )
     {
diff -r 004a886b35d8 -r fe7338e04b37 xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h     Thu Feb 09 12:07:39 2012 +0100
+++ b/xen/include/asm-ia64/config.h     Thu Feb 09 11:33:28 2012 +0000
@@ -20,6 +20,7 @@
 #define CONFIG_EFI
 #define CONFIG_EFI_PCDP
 #define CONFIG_SERIAL_SGI_L1_CONSOLE
+#define CONFIG_KEXEC 1
 #define CONFIG_XENOPROF 1
 
 #define CONFIG_XEN_SMP
diff -r 004a886b35d8 -r fe7338e04b37 xen/include/asm-x86/config.h
--- a/xen/include/asm-x86/config.h      Thu Feb 09 12:07:39 2012 +0100
+++ b/xen/include/asm-x86/config.h      Thu Feb 09 11:33:28 2012 +0000
@@ -49,6 +49,7 @@
 #define CONFIG_HOTPLUG_CPU 1
 
 #define CONFIG_XENOPROF 1
+#define CONFIG_KEXEC 1
 
 #define HZ 100
 

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