git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[pandora-kernel.git]
/
fs
/
proc
/
proc_misc.c
diff --git
a/fs/proc/proc_misc.c
b/fs/proc/proc_misc.c
index
8d88e58
..
93c43b6
100644
(file)
--- a/
fs/proc/proc_misc.c
+++ b/
fs/proc/proc_misc.c
@@
-647,7
+647,7
@@
static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
if (get_user(c, buf))
return -EFAULT;
- __handle_sysrq(c, NULL,
NULL,
0);
+ __handle_sysrq(c, NULL, 0);
}
return count;
}