diff options
Diffstat (limited to 'drivers/xen/cpu_hotplug.c')
| -rw-r--r-- | drivers/xen/cpu_hotplug.c | 11 | 
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c index 14e2d995e95..cc6513a176b 100644 --- a/drivers/xen/cpu_hotplug.c +++ b/drivers/xen/cpu_hotplug.c @@ -1,3 +1,5 @@ +#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt +  #include <linux/notifier.h>  #include <xen/xen.h> @@ -25,12 +27,13 @@ static void disable_hotplug_cpu(int cpu)  static int vcpu_online(unsigned int cpu)  {  	int err; -	char dir[32], state[32]; +	char dir[16], state[16];  	sprintf(dir, "cpu/%u", cpu); -	err = xenbus_scanf(XBT_NIL, dir, "availability", "%s", state); +	err = xenbus_scanf(XBT_NIL, dir, "availability", "%15s", state);  	if (err != 1) { -		printk(KERN_ERR "XENBUS: Unable to read cpu state\n"); +		if (!xen_initial_domain()) +			pr_err("Unable to read cpu state\n");  		return err;  	} @@ -39,7 +42,7 @@ static int vcpu_online(unsigned int cpu)  	else if (strcmp(state, "offline") == 0)  		return 0; -	printk(KERN_ERR "XENBUS: unknown state(%s) on CPU%d\n", state, cpu); +	pr_err("unknown state(%s) on CPU%d\n", state, cpu);  	return -EINVAL;  }  static void vcpu_hotplug(unsigned int cpu)  | 
