summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-19 11:54:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-19 11:54:21 -0700
commit16757372ffa5ee0ef7e82f73a6adbb054a434a13 (patch)
tree578ec3affb4fe2a150404c3f7534a1be06d75244
parente80bd270ec2838699fd598844fe20d20c2b766dd (diff)
downloadlinux-3.10-16757372ffa5ee0ef7e82f73a6adbb054a434a13.tar.gz
linux-3.10-16757372ffa5ee0ef7e82f73a6adbb054a434a13.tar.bz2
linux-3.10-16757372ffa5ee0ef7e82f73a6adbb054a434a13.zip
xen: Fix annoying compile-time warning
Commit cb6b6df111e4 ("xen/pv-on-hvm kexec: add quirk for Xen 3.4 and shutdown watches.") added the xen_strict_xenbus_quirk() function with an old K&R-style declaration without proper typing, causing gcc to rightly complain: drivers/xen/xenbus/xenbus_xs.c:628:13: warning: function declaration isn’t a prototype [-Wstrict-prototypes] because we really don't live in caves using stone-age tools any more, and the kernel has always used properly typed ANSI C function declarations. So if a function doesn't take arguments, we tell the compiler so explicitly by adding the proper "void" in the prototype. I'm sure there are tons of other examples of this kind of stuff in the tree, but this is the one that hits my workstation config, so.. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/xen/xenbus/xenbus_xs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
index 48220e129f8..f5dda83ad7a 100644
--- a/drivers/xen/xenbus/xenbus_xs.c
+++ b/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;