direct-io.hg

changeset 10432:0849bb1b73f9

[LINUX] Fix dependencies on CONFIG_PROC_FS.
Signed-off-by: Horms <horms@verge.net.au>
author kaf24@firebug.cl.cam.ac.uk
date Sat Jun 17 08:56:02 2006 +0100 (2006-06-17)
parents c6f8fcca0282
children 588e1aef89e8
files linux-2.6-xen-sparse/drivers/xen/Kconfig linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c linux-2.6-xen-sparse/drivers/xen/privcmd/Makefile linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/Kconfig	Sat Jun 17 08:42:31 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig	Sat Jun 17 08:56:02 2006 +0100
     1.3 @@ -28,6 +28,11 @@ config XEN_UNPRIVILEGED_GUEST
     1.4  	bool
     1.5  	default !XEN_PRIVILEGED_GUEST
     1.6  
     1.7 +config XEN_PRIVCMD
     1.8 +	bool
     1.9 +	depends on PROC_FS
    1.10 +	default y
    1.11 +
    1.12  config XEN_BACKEND
    1.13          tristate "Backend driver support"
    1.14          default y
    1.15 @@ -84,6 +89,11 @@ config XEN_BLKDEV_BACKEND
    1.16  	  block devices to other guests via a high-performance shared-memory
    1.17  	  interface.
    1.18  
    1.19 +config XEN_XENBUS_DEV
    1.20 +	bool
    1.21 +	depends on PROC_FS
    1.22 +	default y
    1.23 +
    1.24  config XEN_NETDEV_BACKEND
    1.25  	tristate "Network-device backend driver"
    1.26          depends on XEN_BACKEND && NET
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Sat Jun 17 08:42:31 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Sat Jun 17 08:56:02 2006 +0100
     2.3 @@ -58,7 +58,9 @@
     2.4  
     2.5  #define PAGES2KB(_p) ((_p)<<(PAGE_SHIFT-10))
     2.6  
     2.7 +#ifdef CONFIG_PROC_FS
     2.8  static struct proc_dir_entry *balloon_pde;
     2.9 +#endif
    2.10  
    2.11  static DECLARE_MUTEX(balloon_mutex);
    2.12  
    2.13 @@ -403,6 +405,7 @@ static int balloon_init_watcher(struct n
    2.14  	return NOTIFY_DONE;
    2.15  }
    2.16  
    2.17 +#ifdef CONFIG_PROC_FS
    2.18  static int balloon_write(struct file *file, const char __user *buffer,
    2.19  			 unsigned long count, void *data)
    2.20  {
    2.21 @@ -456,6 +459,7 @@ static int balloon_read(char *page, char
    2.22  	*eof = 1;
    2.23  	return len;
    2.24  }
    2.25 +#endif
    2.26  
    2.27  static struct notifier_block xenstore_notifier;
    2.28  
    2.29 @@ -481,6 +485,7 @@ static int __init balloon_init(void)
    2.30  	balloon_timer.data = 0;
    2.31  	balloon_timer.function = balloon_alarm;
    2.32      
    2.33 +#ifdef CONFIG_PROC_FS
    2.34  	if ((balloon_pde = create_xen_proc_entry("balloon", 0644)) == NULL) {
    2.35  		WPRINTK("Unable to create /proc/xen/balloon.\n");
    2.36  		return -1;
    2.37 @@ -488,6 +493,7 @@ static int __init balloon_init(void)
    2.38  
    2.39  	balloon_pde->read_proc  = balloon_read;
    2.40  	balloon_pde->write_proc = balloon_write;
    2.41 +#endif
    2.42      
    2.43  	/* Initialise the balloon with excess memory space. */
    2.44  	for (pfn = xen_start_info->nr_pages; pfn < max_pfn; pfn++) {
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/Makefile	Sat Jun 17 08:42:31 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/Makefile	Sat Jun 17 08:56:02 2006 +0100
     3.3 @@ -1,2 +1,2 @@
     3.4  
     3.5 -obj-y	:= privcmd.o
     3.6 +obj-$(CONFIG_XEN_PRIVCMD)	:= privcmd.o
     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile	Sat Jun 17 08:42:31 2006 +0100
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile	Sat Jun 17 08:56:02 2006 +0100
     4.3 @@ -9,4 +9,4 @@ xenbus-objs += xenbus_client.o
     4.4  xenbus-objs += xenbus_comms.o
     4.5  xenbus-objs += xenbus_xs.o
     4.6  xenbus-objs += xenbus_probe.o
     4.7 -xenbus-objs += xenbus_dev.o
     4.8 +obj-$(CONFIG_XEN_XENBUS_DEV) += xenbus_dev.o
     5.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Sat Jun 17 08:42:31 2006 +0100
     5.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Sat Jun 17 08:56:02 2006 +0100
     5.3 @@ -926,6 +926,7 @@ void xenbus_probe(void *unused)
     5.4  }
     5.5  
     5.6  
     5.7 +#ifdef CONFIG_PROC_FS
     5.8  static struct file_operations xsd_kva_fops;
     5.9  static struct proc_dir_entry *xsd_kva_intf;
    5.10  static struct proc_dir_entry *xsd_port_intf;
    5.11 @@ -964,6 +965,7 @@ static int xsd_port_read(char *page, cha
    5.12  	*eof = 1;
    5.13  	return len;
    5.14  }
    5.15 +#endif
    5.16  
    5.17  
    5.18  static int __init xenbus_probe_init(void)
    5.19 @@ -1008,6 +1010,7 @@ static int __init xenbus_probe_init(void
    5.20  		BUG_ON(err);
    5.21  		xen_start_info->store_evtchn = alloc_unbound.port;
    5.22  
    5.23 +#ifdef CONFIG_PROC_FS
    5.24  		/* And finally publish the above info in /proc/xen */
    5.25  		xsd_kva_intf = create_xen_proc_entry("xsd_kva", 0600);
    5.26  		if (xsd_kva_intf) {
    5.27 @@ -1020,6 +1023,7 @@ static int __init xenbus_probe_init(void
    5.28  		xsd_port_intf = create_xen_proc_entry("xsd_port", 0400);
    5.29  		if (xsd_port_intf)
    5.30  			xsd_port_intf->read_proc = xsd_port_read;
    5.31 +#endif
    5.32  	} else
    5.33  		xenstored_ready = 1;
    5.34