From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 2 Feb 2014 08:45:39 +0000 (+0100)
Subject: Merge branch 'linus' into sched/core, to resolve conflicts
X-Git-Tag: v4.14-rc1~7788^2~56
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eaa4e4fcf1b5c60e656d93242f7fe422173f25b2;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'linus' into sched/core, to resolve conflicts

Conflicts:
	kernel/sysctl.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

eaa4e4fcf1b5c60e656d93242f7fe422173f25b2
diff --cc kernel/sysctl.c
index b41d61d95c14,49e13e1f8fe6..7754ff16f334
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -384,6 -385,22 +385,15 @@@ static struct ctl_table kern_table[] = 
  		.mode		= 0644,
  		.proc_handler	= proc_dointvec,
  	},
 -	{
 -		.procname       = "numa_balancing_migrate_deferred",
 -		.data           = &sysctl_numa_balancing_migrate_deferred,
 -		.maxlen         = sizeof(unsigned int),
 -		.mode           = 0644,
 -		.proc_handler   = proc_dointvec,
 -	},
+ 	{
+ 		.procname	= "numa_balancing",
+ 		.data		= NULL, /* filled in by handler */
+ 		.maxlen		= sizeof(unsigned int),
+ 		.mode		= 0644,
+ 		.proc_handler	= sysctl_numa_balancing,
+ 		.extra1		= &zero,
+ 		.extra2		= &one,
+ 	},
  #endif /* CONFIG_NUMA_BALANCING */
  #endif /* CONFIG_SCHED_DEBUG */
  	{