diff options
| author | Linus Torvalds | 2006-10-06 01:32:01 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-10-06 01:32:01 +0200 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /fs | |
| parent | [PATCH] UDF: Fix mounting read-write (diff) | |
| parent | IRQ: Maintain regs pointer globally rather than passing to IRQ handlers (diff) | |
| download | kernel-qcow2-linux-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.tar.gz kernel-qcow2-linux-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.tar.xz kernel-qcow2-linux-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.zip | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'fs')
| -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, if (get_user(c, buf)) return -EFAULT; - __handle_sysrq(c, NULL, NULL, 0); + __handle_sysrq(c, NULL, 0); } return count; } |