diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 02:01:14 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 02:01:14 -0400 |
| commit | cf9fe114e3b37e14fc8434d5abb192e35df551b1 (patch) | |
| tree | 0f82879295dc792f9df1a3ce79e143a3c073510f /kernel/sysctl.c | |
| parent | c1d0d32a603ed06377f404adf2c538de33bb3634 (diff) | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index b2970d56fb76..6a463716ecbf 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -731,6 +731,14 @@ static struct ctl_table kern_table[] = { | |||
| 731 | }, | 731 | }, |
| 732 | { | 732 | { |
| 733 | .ctl_name = CTL_UNNUMBERED, | 733 | .ctl_name = CTL_UNNUMBERED, |
| 734 | .procname = "bootloader_version", | ||
| 735 | .data = &bootloader_version, | ||
| 736 | .maxlen = sizeof (int), | ||
| 737 | .mode = 0444, | ||
| 738 | .proc_handler = &proc_dointvec, | ||
| 739 | }, | ||
| 740 | { | ||
| 741 | .ctl_name = CTL_UNNUMBERED, | ||
| 734 | .procname = "kstack_depth_to_print", | 742 | .procname = "kstack_depth_to_print", |
| 735 | .data = &kstack_depth_to_print, | 743 | .data = &kstack_depth_to_print, |
| 736 | .maxlen = sizeof(int), | 744 | .maxlen = sizeof(int), |