diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /fs/proc/proc_misc.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'fs/proc/proc_misc.c')
| -rw-r--r-- | fs/proc/proc_misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 8d88e58ed5cc..93c43b676e59 100644 --- 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, | |||
| 647 | 647 | ||
| 648 | if (get_user(c, buf)) | 648 | if (get_user(c, buf)) |
| 649 | return -EFAULT; | 649 | return -EFAULT; |
| 650 | __handle_sysrq(c, NULL, NULL, 0); | 650 | __handle_sysrq(c, NULL, 0); |
| 651 | } | 651 | } |
| 652 | return count; | 652 | return count; |
| 653 | } | 653 | } |