From 23282bf960afdb72950f5eeb1f761e99b24c151d Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Oct 2012 11:54:21 -0700
Subject: [PATCH] --- yaml --- r: 334577 b: refs/heads/master c:
 16757372ffa5ee0ef7e82f73a6adbb054a434a13 h: refs/heads/master i:   334575:
 5a4ffb573a81b8a939137f50288404bb1f5fac33 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/xen/xenbus/xenbus_xs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 63350e751331..b112ff09bfe0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e80bd270ec2838699fd598844fe20d20c2b766dd
+refs/heads/master: 16757372ffa5ee0ef7e82f73a6adbb054a434a13
diff --git a/trunk/drivers/xen/xenbus/xenbus_xs.c b/trunk/drivers/xen/xenbus/xenbus_xs.c
index 48220e129f85..f5dda83ad7a5 100644
--- a/trunk/drivers/xen/xenbus/xenbus_xs.c
+++ b/trunk/drivers/xen/xenbus/xenbus_xs.c
@@ -625,7 +625,7 @@ static struct xenbus_watch *find_watch(const char *token)
  * so if we are running on anything older than 4 do not attempt to read
  * control/platform-feature-xs_reset_watches.
  */
-static bool xen_strict_xenbus_quirk()
+static bool xen_strict_xenbus_quirk(void)
 {
 	uint32_t eax, ebx, ecx, edx, base;