diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 04:23:27 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 04:23:27 -0500 |
| commit | 6b620478e58677bb3f4ec884abb29ef9d68c7821 (patch) | |
| tree | 7a438fc5412587f9bd9b907d4d423ea52a498006 /kernel/sysctl.c | |
| parent | 906b17dc089f7fa87e37a9cfe6ee185efc90e0da (diff) | |
| parent | 6fb1b304255efc5c4c93874ac8c066272e257e28 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index bc86bb32e126..0f1bd83db985 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -170,7 +170,8 @@ static int proc_taint(struct ctl_table *table, int write, | |||
| 170 | #endif | 170 | #endif |
| 171 | 171 | ||
| 172 | #ifdef CONFIG_MAGIC_SYSRQ | 172 | #ifdef CONFIG_MAGIC_SYSRQ |
| 173 | static int __sysrq_enabled; /* Note: sysrq code ises it's own private copy */ | 173 | /* Note: sysrq code uses it's own private copy */ |
| 174 | static int __sysrq_enabled = SYSRQ_DEFAULT_ENABLE; | ||
| 174 | 175 | ||
| 175 | static int sysrq_sysctl_handler(ctl_table *table, int write, | 176 | static int sysrq_sysctl_handler(ctl_table *table, int write, |
| 176 | void __user *buffer, size_t *lenp, | 177 | void __user *buffer, size_t *lenp, |