summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2007-02-10 01:43:34 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 10:51:19 -0800
commitd12c610e08022a1b84d6bd4412c189214d32e713 (patch)
tree1bf24f5d668a148e9a48dff388a2d04d3ceb313a /kernel/power
parent259130526c267550bc365d3015917d90667732f1 (diff)
downloadlinux-stable-d12c610e08022a1b84d6bd4412c189214d32e713.tar.gz
linux-stable-d12c610e08022a1b84d6bd4412c189214d32e713.tar.bz2
linux-stable-d12c610e08022a1b84d6bd4412c189214d32e713.zip
[PATCH] swsusp-change-code-ordering-in-userc-sanity
The compiler will do that. And if it doesn't, we don't want to either ;) Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: Pavel Machek <pavel@ucw.cz> Cc: Greg KH <greg@kroah.com> Cc: Nigel Cunningham <nigel@suspend2.net> Cc: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/user.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 4f217683455f..b70d83d6b16e 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -122,7 +122,7 @@ static ssize_t snapshot_write(struct file *filp, const char __user *buf,
return res;
}
-static inline int snapshot_suspend(void)
+static int snapshot_suspend(void)
{
int error;
@@ -151,7 +151,7 @@ static inline int snapshot_suspend(void)
return error;
}
-static inline int snapshot_restore(void)
+static int snapshot_restore(void)
{
int error;