From 78979d33ec7b0c361aa3e3a146e07ba8ad25299f Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de>
Date: Thu, 28 Jul 2011 15:23:03 +0200
Subject: [PATCH] --- yaml --- r: 274727 b: refs/heads/master c:
 6b71c52e7f848e2c9f804e175215e5965ea90d32 h: refs/heads/master i:   274725:
 e3ec11cd0cf9f1627a8777742649d0db4aefbefc   274723:
 87c68feab8d40240d82774bf7478db220288163f   274719:
 8d837a7b042931b3125c674d1b3a7b4ac20601d8 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/xen/xen-balloon.c | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 329d1e3fa37c..5d1cd98dc3ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6913200a566b6d2866d46d7b947a2326c4e11f55
+refs/heads/master: 6b71c52e7f848e2c9f804e175215e5965ea90d32
diff --git a/trunk/drivers/xen/xen-balloon.c b/trunk/drivers/xen/xen-balloon.c
index 5c9dc43c1e94..9cc2259c9992 100644
--- a/trunk/drivers/xen/xen-balloon.c
+++ b/trunk/drivers/xen/xen-balloon.c
@@ -50,11 +50,6 @@ static struct sys_device balloon_sysdev;
 
 static int register_balloon(struct sys_device *sysdev);
 
-static struct xenbus_watch target_watch =
-{
-	.node = "memory/target"
-};
-
 /* React to a change in the target key */
 static void watch_target(struct xenbus_watch *watch,
 			 const char **vec, unsigned int len)
@@ -73,6 +68,11 @@ static void watch_target(struct xenbus_watch *watch,
 	 */
 	balloon_set_new_target(new_target >> (PAGE_SHIFT - 10));
 }
+static struct xenbus_watch target_watch = {
+	.node = "memory/target",
+	.callback = watch_target,
+};
+
 
 static int balloon_init_watcher(struct notifier_block *notifier,
 				unsigned long event,
@@ -87,7 +87,9 @@ static int balloon_init_watcher(struct notifier_block *notifier,
 	return NOTIFY_DONE;
 }
 
-static struct notifier_block xenstore_notifier;
+static struct notifier_block xenstore_notifier = {
+	.notifier_call = balloon_init_watcher,
+};
 
 static int __init balloon_init(void)
 {
@@ -100,9 +102,6 @@ static int __init balloon_init(void)
 
 	register_xen_selfballooning(&balloon_sysdev);
 
-	target_watch.callback = watch_target;
-	xenstore_notifier.notifier_call = balloon_init_watcher;
-
 	register_xenstore_notifier(&xenstore_notifier);
 
 	return 0;