diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 15:31:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 15:31:15 -0700 |
| commit | e7d688ec86c9c6aa94b58eeb266f833a76407018 (patch) | |
| tree | db7ce6fe6fc9b8c69287d2e8ee11f8724d171682 /drivers/s390/char/sclp_async.c | |
| parent | Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 (diff) | |
| parent | [S390] sclp_vt220 build fix (diff) | |
| download | linux-dev-e7d688ec86c9c6aa94b58eeb266f833a76407018.tar.xz linux-dev-e7d688ec86c9c6aa94b58eeb266f833a76407018.zip | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] sclp_vt220 build fix
[S390] cio: change misleading console logic
[S390] call home support: fix proc handler
[S390] dasd: use idal for device characteristics
[S390] Add highgprs facility to /proc/cpuinfo
[S390] dasd: fix locking bug
[S390] tape390: Fix request queue handling in block driver
[S390] hypfs: Use subcode 6 if subcode 7 is not available
Diffstat (limited to 'drivers/s390/char/sclp_async.c')
| -rw-r--r-- | drivers/s390/char/sclp_async.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/char/sclp_async.c b/drivers/s390/char/sclp_async.c index daaec185ed36..a4f68e5b9c96 100644 --- a/drivers/s390/char/sclp_async.c +++ b/drivers/s390/char/sclp_async.c @@ -62,7 +62,7 @@ static struct notifier_block call_home_panic_nb = { .priority = INT_MAX, }; -static int proc_handler_callhome(ctl_table *ctl, int write, struct file *filp, +static int proc_handler_callhome(struct ctl_table *ctl, int write, void __user *buffer, size_t *count, loff_t *ppos) { @@ -100,7 +100,7 @@ static struct ctl_table callhome_table[] = { { .procname = "callhome", .mode = 0644, - .proc_handler = &proc_handler_callhome, + .proc_handler = proc_handler_callhome, }, { .ctl_name = 0 } }; |