aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-12 07:08:57 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-12 07:08:57 -0500
commit871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch)
treefdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /kernel/sysctl.c
parentcf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff)
parentb578f3fcca1e78624dfb5f358776e63711d7fda2 (diff)
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 2481ed30d2b5..3b6b54c8ac0d 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -101,6 +101,7 @@ static int two = 2;
101 101
102static int zero; 102static int zero;
103static int one = 1; 103static int one = 1;
104static unsigned long one_ul = 1;
104static int one_hundred = 100; 105static int one_hundred = 100;
105 106
106/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ 107/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
@@ -144,6 +145,7 @@ extern int acct_parm[];
144 145
145#ifdef CONFIG_IA64 146#ifdef CONFIG_IA64
146extern int no_unaligned_warning; 147extern int no_unaligned_warning;
148extern int unaligned_dump_stack;
147#endif 149#endif
148 150
149#ifdef CONFIG_RT_MUTEXES 151#ifdef CONFIG_RT_MUTEXES
@@ -781,6 +783,14 @@ static struct ctl_table kern_table[] = {
781 .mode = 0644, 783 .mode = 0644,
782 .proc_handler = &proc_dointvec, 784 .proc_handler = &proc_dointvec,
783 }, 785 },
786 {
787 .ctl_name = CTL_UNNUMBERED,
788 .procname = "unaligned-dump-stack",
789 .data = &unaligned_dump_stack,
790 .maxlen = sizeof (int),
791 .mode = 0644,
792 .proc_handler = &proc_dointvec,
793 },
784#endif 794#endif
785#ifdef CONFIG_DETECT_SOFTLOCKUP 795#ifdef CONFIG_DETECT_SOFTLOCKUP
786 { 796 {
@@ -978,7 +988,7 @@ static struct ctl_table vm_table[] = {
978 .mode = 0644, 988 .mode = 0644,
979 .proc_handler = &dirty_background_bytes_handler, 989 .proc_handler = &dirty_background_bytes_handler,
980 .strategy = &sysctl_intvec, 990 .strategy = &sysctl_intvec,
981 .extra1 = &one, 991 .extra1 = &one_ul,
982 }, 992 },
983 { 993 {
984 .ctl_name = VM_DIRTY_RATIO, 994 .ctl_name = VM_DIRTY_RATIO,
@@ -999,7 +1009,7 @@ static struct ctl_table vm_table[] = {
999 .mode = 0644, 1009 .mode = 0644,
1000 .proc_handler = &dirty_bytes_handler, 1010 .proc_handler = &dirty_bytes_handler,
1001 .strategy = &sysctl_intvec, 1011 .strategy = &sysctl_intvec,
1002 .extra1 = &one, 1012 .extra1 = &one_ul,
1003 }, 1013 },
1004 { 1014 {
1005 .procname = "dirty_writeback_centisecs", 1015 .procname = "dirty_writeback_centisecs",
@@ -1701,7 +1711,7 @@ int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *ol
1701 return error; 1711 return error;
1702} 1712}
1703 1713
1704asmlinkage long sys_sysctl(struct __sysctl_args __user *args) 1714SYSCALL_DEFINE1(sysctl, struct __sysctl_args __user *, args)
1705{ 1715{
1706 struct __sysctl_args tmp; 1716 struct __sysctl_args tmp;
1707 int error; 1717 int error;
@@ -3002,7 +3012,7 @@ int sysctl_ms_jiffies(struct ctl_table *table,
3002#else /* CONFIG_SYSCTL_SYSCALL */ 3012#else /* CONFIG_SYSCTL_SYSCALL */
3003 3013
3004 3014
3005asmlinkage long sys_sysctl(struct __sysctl_args __user *args) 3015SYSCALL_DEFINE1(sysctl, struct __sysctl_args __user *, args)
3006{ 3016{
3007 struct __sysctl_args tmp; 3017 struct __sysctl_args tmp;
3008 int error; 3018 int error;