X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=blobdiff_plain;f=kernel%2Fsysctl.c;h=a04cdcf29e1f977231724dcd5d1f5b0f118b4094;hp=4fd49fe1046df606488eb806468a67c767ce840e;hb=b9e7bc93d665a989f62f385d6982dd8d92c0e7dd;hpb=2ecaf1d025af0f481d00b3701ffbcc600dcab076

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 4fd49fe1046d..a04cdcf29e1f 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -105,6 +105,8 @@ extern char core_pattern[];
 extern unsigned int core_pipe_limit;
 #endif
 extern int pid_max;
+extern int extra_free_kbytes;
+extern int min_free_order_shift;
 extern int pid_max_min, pid_max_max;
 extern int percpu_pagelist_fraction;
 extern int compat_log;
@@ -1281,6 +1283,21 @@ static struct ctl_table vm_table[] = {
 		.proc_handler	= min_free_kbytes_sysctl_handler,
 		.extra1		= &zero,
 	},
+	{
+		.procname	= "extra_free_kbytes",
+		.data		= &extra_free_kbytes,
+		.maxlen		= sizeof(extra_free_kbytes),
+		.mode		= 0644,
+		.proc_handler	= min_free_kbytes_sysctl_handler,
+		.extra1		= &zero,
+	},
+	{
+		.procname	= "min_free_order_shift",
+		.data		= &min_free_order_shift,
+		.maxlen		= sizeof(min_free_order_shift),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec
+	},
 	{
 		.procname	= "percpu_pagelist_fraction",
 		.data		= &percpu_pagelist_fraction,
@@ -1711,10 +1728,11 @@ static int _proc_do_string(void* data, int maxlen, int write,
 		len = 0;
 		p = buffer;
 		while (len < *lenp) {
-			if (get_user(c, p++))
+			if (get_user(c, p))
 				return -EFAULT;
 			if (c == 0 || c == '\n')
 				break;
+			p++;
 			len++;
 		}
 		if (len >= maxlen)