[Xen-changelog] [xen-unstable] [LINUX] Fix dependencies on CONFIG_PROC_FS.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 0849bb1b73f96da7b04cea6060bca4e5f6299675
# Parent  c6f8fcca02820b3e73966f44bc04f5fc4991b681
[LINUX] Fix dependencies on CONFIG_PROC_FS. 
Signed-off-by: Horms <horms@xxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/xen/Kconfig               |   10 ++++++++++
 linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c     |    6 ++++++
 linux-2.6-xen-sparse/drivers/xen/privcmd/Makefile      |    2 +-
 linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile       |    2 +-
 linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c |    4 ++++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff -r c6f8fcca0282 -r 0849bb1b73f9 linux-2.6-xen-sparse/drivers/xen/Kconfig
--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig  Sat Jun 17 08:42:31 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig  Sat Jun 17 08:56:02 2006 +0100
@@ -27,6 +27,11 @@ config XEN_UNPRIVILEGED_GUEST
 config XEN_UNPRIVILEGED_GUEST
        bool
        default !XEN_PRIVILEGED_GUEST
+
+config XEN_PRIVCMD
+       bool
+       depends on PROC_FS
+       default y
 
 config XEN_BACKEND
         tristate "Backend driver support"
@@ -84,6 +89,11 @@ config XEN_BLKDEV_BACKEND
          block devices to other guests via a high-performance shared-memory
          interface.
 
+config XEN_XENBUS_DEV
+       bool
+       depends on PROC_FS
+       default y
+
 config XEN_NETDEV_BACKEND
        tristate "Network-device backend driver"
         depends on XEN_BACKEND && NET
diff -r c6f8fcca0282 -r 0849bb1b73f9 
linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Sat Jun 17 
08:42:31 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Sat Jun 17 
08:56:02 2006 +0100
@@ -58,7 +58,9 @@
 
 #define PAGES2KB(_p) ((_p)<<(PAGE_SHIFT-10))
 
+#ifdef CONFIG_PROC_FS
 static struct proc_dir_entry *balloon_pde;
+#endif
 
 static DECLARE_MUTEX(balloon_mutex);
 
@@ -403,6 +405,7 @@ static int balloon_init_watcher(struct n
        return NOTIFY_DONE;
 }
 
+#ifdef CONFIG_PROC_FS
 static int balloon_write(struct file *file, const char __user *buffer,
                         unsigned long count, void *data)
 {
@@ -456,6 +459,7 @@ static int balloon_read(char *page, char
        *eof = 1;
        return len;
 }
+#endif
 
 static struct notifier_block xenstore_notifier;
 
@@ -481,6 +485,7 @@ static int __init balloon_init(void)
        balloon_timer.data = 0;
        balloon_timer.function = balloon_alarm;
     
+#ifdef CONFIG_PROC_FS
        if ((balloon_pde = create_xen_proc_entry("balloon", 0644)) == NULL) {
                WPRINTK("Unable to create /proc/xen/balloon.\n");
                return -1;
@@ -488,6 +493,7 @@ static int __init balloon_init(void)
 
        balloon_pde->read_proc  = balloon_read;
        balloon_pde->write_proc = balloon_write;
+#endif
     
        /* Initialise the balloon with excess memory space. */
        for (pfn = xen_start_info->nr_pages; pfn < max_pfn; pfn++) {
diff -r c6f8fcca0282 -r 0849bb1b73f9 
linux-2.6-xen-sparse/drivers/xen/privcmd/Makefile
--- a/linux-2.6-xen-sparse/drivers/xen/privcmd/Makefile Sat Jun 17 08:42:31 
2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/Makefile Sat Jun 17 08:56:02 
2006 +0100
@@ -1,2 +1,2 @@
 
-obj-y  := privcmd.o
+obj-$(CONFIG_XEN_PRIVCMD)      := privcmd.o
diff -r c6f8fcca0282 -r 0849bb1b73f9 
linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile  Sat Jun 17 08:42:31 
2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile  Sat Jun 17 08:56:02 
2006 +0100
@@ -9,4 +9,4 @@ xenbus-objs += xenbus_comms.o
 xenbus-objs += xenbus_comms.o
 xenbus-objs += xenbus_xs.o
 xenbus-objs += xenbus_probe.o
-xenbus-objs += xenbus_dev.o
+obj-$(CONFIG_XEN_XENBUS_DEV) += xenbus_dev.o
diff -r c6f8fcca0282 -r 0849bb1b73f9 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c    Sat Jun 17 
08:42:31 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c    Sat Jun 17 
08:56:02 2006 +0100
@@ -926,6 +926,7 @@ void xenbus_probe(void *unused)
 }
 
 
+#ifdef CONFIG_PROC_FS
 static struct file_operations xsd_kva_fops;
 static struct proc_dir_entry *xsd_kva_intf;
 static struct proc_dir_entry *xsd_port_intf;
@@ -964,6 +965,7 @@ static int xsd_port_read(char *page, cha
        *eof = 1;
        return len;
 }
+#endif
 
 
 static int __init xenbus_probe_init(void)
@@ -1008,6 +1010,7 @@ static int __init xenbus_probe_init(void
                BUG_ON(err);
                xen_start_info->store_evtchn = alloc_unbound.port;
 
+#ifdef CONFIG_PROC_FS
                /* And finally publish the above info in /proc/xen */
                xsd_kva_intf = create_xen_proc_entry("xsd_kva", 0600);
                if (xsd_kva_intf) {
@@ -1020,6 +1023,7 @@ static int __init xenbus_probe_init(void
                xsd_port_intf = create_xen_proc_entry("xsd_port", 0400);
                if (xsd_port_intf)
                        xsd_port_intf->read_proc = xsd_port_read;
+#endif
        } else
                xenstored_ready = 1;
 

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