[Xen-changelog] [linux-2.6.18-xen] don't build firmware bits for non-privileged kernel

[Xen patchbot-linux-2.6.18-xen <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1318491350 -7200
# Node ID a2c506341809d358a65fee1486f76b6152325e8d
# Parent  e8e3b1247124e6e9ae603a7f8ed845ebb2b28171
don't build firmware bits for non-privileged kernel

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r e8e3b1247124 -r a2c506341809 arch/i386/Kconfig
--- a/arch/i386/Kconfig Thu Oct 13 09:33:56 2011 +0200
+++ b/arch/i386/Kconfig Thu Oct 13 09:35:50 2011 +0200
@@ -452,7 +452,9 @@
        bool
        default n
 
+if !XEN_UNPRIVILEGED_GUEST
 source "drivers/firmware/Kconfig"
+endif
 
 choice
        prompt "High Memory Support"
diff -r e8e3b1247124 -r a2c506341809 arch/x86_64/Kconfig
--- a/arch/x86_64/Kconfig       Thu Oct 13 09:33:56 2011 +0200
+++ b/arch/x86_64/Kconfig       Thu Oct 13 09:35:50 2011 +0200
@@ -682,7 +682,9 @@
 
 source drivers/Kconfig
 
+if !XEN_UNPRIVILEGED_GUEST
 source "drivers/firmware/Kconfig"
+endif
 
 source fs/Kconfig
 
diff -r e8e3b1247124 -r a2c506341809 drivers/xen/core/Makefile
--- a/drivers/xen/core/Makefile Thu Oct 13 09:33:56 2011 +0200
+++ b/drivers/xen/core/Makefile Thu Oct 13 09:35:50 2011 +0200
@@ -2,9 +2,10 @@
 # Makefile for the linux kernel.
 #
 
-obj-y := evtchn.o gnttab.o features.o reboot.o machine_reboot.o firmware.o
+obj-y := evtchn.o gnttab.o features.o reboot.o machine_reboot.o
 
 obj-$(CONFIG_PCI)              += pci.o
+obj-$(CONFIG_XEN_PRIVILEGED_GUEST) += firmware.o
 obj-$(CONFIG_PROC_FS)          += xen_proc.o
 obj-$(CONFIG_SYS_HYPERVISOR)   += hypervisor_sysfs.o
 obj-$(CONFIG_HOTPLUG_CPU)      += cpu_hotplug.o
diff -r e8e3b1247124 -r a2c506341809 include/xen/firmware.h
--- a/include/xen/firmware.h    Thu Oct 13 09:33:56 2011 +0200
+++ b/include/xen/firmware.h    Thu Oct 13 09:35:50 2011 +0200
@@ -5,6 +5,10 @@
 void copy_edd(void);
 #endif
 
+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
 void copy_edid(void);
+#else
+static inline void copy_edid(void) {}
+#endif
 
 #endif /* __XEN_FIRMWARE_H__ */

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