[Xen-devel] [PATCH] linux-2.6.18: don't build firmware bits for non-privileged kernel

["Jan Beulich" <JBeulich@xxxxxxxx>]

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

--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -452,7 +452,9 @@ source "net/Kconfig"
        bool
        default n
 
+if !XEN_UNPRIVILEGED_GUEST
 source "drivers/firmware/Kconfig"
+endif
 
 choice
        prompt "High Memory Support"
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -682,7 +682,9 @@ source "net/Kconfig"
 
 source drivers/Kconfig
 
+if !XEN_UNPRIVILEGED_GUEST
 source "drivers/firmware/Kconfig"
+endif
 
 source fs/Kconfig
 
--- a/drivers/xen/core/Makefile
+++ b/drivers/xen/core/Makefile
@@ -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
--- a/include/xen/firmware.h
+++ b/include/xen/firmware.h
@@ -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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel