ia64/xen-unstable

changeset 7157:9918d8c3e116

Merge.
author emellor@ewan
date Fri Sep 30 17:10:52 2005 +0100 (2005-09-30)
parents 244f1aa98d30 71466686d026
children 78e1e94e4088 486f1c3e7805
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Fri Sep 30 17:10:20 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Fri Sep 30 17:10:52 2005 +0100
     1.3 @@ -607,7 +607,6 @@ void xenbus_suspend(void)
     1.4  	down(&xenbus_lock);
     1.5  	bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, suspend_dev);
     1.6  	bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, suspend_dev);
     1.7 -	xb_suspend_comms();
     1.8  }
     1.9  
    1.10  void xenbus_resume(void)
    1.11 @@ -651,7 +650,6 @@ int do_xenbus_probe(void *unused)
    1.12  	int err = 0;
    1.13  
    1.14  	/* Initialize xenstore comms unless already done. */
    1.15 -	printk("store_evtchn = %i\n", xen_start_info->store_evtchn);
    1.16  	err = xs_init();
    1.17  	if (err) {
    1.18  		printk("XENBUS: Error initializing xenstore comms:"