Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcbf77b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-core-for-linus' of... 

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
  sched: Fix SD_POWERSAVING_BALANCE|SD_PREFER_LOCAL vs SD_WAKE_AFFINE
  sched: Stop buddies from hogging the system
  sched: Add new wakeup preemption mode: WAKEUP_RUNNING
  sched: Fix TASK_WAKING & loadaverage breakage
  sched: Disable wakeup balancing
  sched: Rename flags to wake_flags
  sched: Clean up the load_idx selection in select_task_rq_fair
  sched: Optimize cgroup vs wakeup a bit
  sched: x86: Name old_perf in a unique way
  sched: Implement a gentler fair-sleepers feature
  sched: Add SD_PREFER_LOCAL
  sched: Add a few SYNC hint knobs to play with
  sched: Fix sync wakeups again
  sched: Add WF_FORK
  sched: Rename sync arguments
  sched: Rename select_task_rq() argument
  sched: Feature to disable APERF/MPERF cpu_power
  x86: sched: Provide arch implementations using aperf/mperf
  x86: Add generic aperf/mperf code
  x86: Move APERF/MPERF into a X86_FEATURE
  ...

Fix up trivial conflict in arch/x86/include/asm/processor.h due to
nearby addition of amd_get_nb_id() declaration from the EDAC merge.
parents ca043a66 29cd8bae

arch/ia64/include/asm/topology.h

+9 −8
Original line number Original line Diff line number Diff line
@@ -61,12 +61,13 @@ void build_cpu_to_node_map(void); 
	.cache_nice_tries	= 2,			\

	.cache_nice_tries	= 2,			\

	.busy_idx		= 2,			\

	.busy_idx		= 2,			\

	.idle_idx		= 1,			\

	.idle_idx		= 1,			\

	.newidle_idx		= 2,			\

	.newidle_idx		= 0,			\

	.wake_idx		= 1,			\

	.wake_idx		= 0,			\

	.forkexec_idx		= 1,			\

	.forkexec_idx		= 0,			\

	.flags			= SD_LOAD_BALANCE	\

	.flags			= SD_LOAD_BALANCE	\

				| SD_BALANCE_NEWIDLE	\

				| SD_BALANCE_NEWIDLE	\

				| SD_BALANCE_EXEC	\

				| SD_BALANCE_EXEC	\

				| SD_BALANCE_FORK	\

				| SD_WAKE_AFFINE,	\

				| SD_WAKE_AFFINE,	\

	.last_balance		= jiffies,		\

	.last_balance		= jiffies,		\

	.balance_interval	= 1,			\

	.balance_interval	= 1,			\
@@ -85,14 +86,14 @@ void build_cpu_to_node_map(void); 
	.cache_nice_tries	= 2,			\

	.cache_nice_tries	= 2,			\

	.busy_idx		= 3,			\

	.busy_idx		= 3,			\

	.idle_idx		= 2,			\

	.idle_idx		= 2,			\

	.newidle_idx		= 2,			\

	.newidle_idx		= 0,			\

	.wake_idx		= 1,			\

	.wake_idx		= 0,			\

	.forkexec_idx		= 1,			\

	.forkexec_idx		= 0,			\

	.flags			= SD_LOAD_BALANCE	\

	.flags			= SD_LOAD_BALANCE	\

				| SD_BALANCE_NEWIDLE	\

				| SD_BALANCE_EXEC	\

				| SD_BALANCE_EXEC	\

				| SD_BALANCE_FORK	\

				| SD_BALANCE_FORK	\

				| SD_SERIALIZE		\

				| SD_SERIALIZE,		\

				| SD_WAKE_BALANCE,	\

	.last_balance		= jiffies,		\

	.last_balance		= jiffies,		\

	.balance_interval	= 64,			\

	.balance_interval	= 64,			\

	.nr_balance_failed	= 0,			\

	.nr_balance_failed	= 0,			\

arch/mips/include/asm/mach-ip27/topology.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -48,7 +48,6 @@ extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES]; 
	.cache_nice_tries	= 1,			\

	.cache_nice_tries	= 1,			\

	.flags			= SD_LOAD_BALANCE	\

	.flags			= SD_LOAD_BALANCE	\

				| SD_BALANCE_EXEC	\

				| SD_BALANCE_EXEC	\

				| SD_WAKE_BALANCE,	\

	.last_balance		= jiffies,		\

	.last_balance		= jiffies,		\

	.balance_interval	= 1,			\

	.balance_interval	= 1,			\

	.nr_balance_failed	= 0,			\

	.nr_balance_failed	= 0,			\

arch/powerpc/include/asm/topology.h

+4 −5
Original line number Original line Diff line number Diff line
@@ -57,14 +57,13 @@ static inline int pcibus_to_node(struct pci_bus *bus) 
	.cache_nice_tries	= 1,			\

	.cache_nice_tries	= 1,			\

	.busy_idx		= 3,			\

	.busy_idx		= 3,			\

	.idle_idx		= 1,			\

	.idle_idx		= 1,			\

	.newidle_idx		= 2,			\

	.newidle_idx		= 0,			\

	.wake_idx		= 1,			\

	.wake_idx		= 0,			\

	.flags			= SD_LOAD_BALANCE	\

	.flags			= SD_LOAD_BALANCE	\

				| SD_BALANCE_EXEC	\

				| SD_BALANCE_EXEC	\

				| SD_BALANCE_FORK	\

				| SD_BALANCE_NEWIDLE	\

				| SD_BALANCE_NEWIDLE	\

				| SD_WAKE_IDLE		\

				| SD_SERIALIZE,		\

				| SD_SERIALIZE		\

				| SD_WAKE_BALANCE,	\

	.last_balance		= jiffies,		\

	.last_balance		= jiffies,		\

	.balance_interval	= 1,			\

	.balance_interval	= 1,			\

	.nr_balance_failed	= 0,			\

	.nr_balance_failed	= 0,			\

arch/sh/include/asm/topology.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -15,14 +15,14 @@ 
	.cache_nice_tries	= 2,			\

	.cache_nice_tries	= 2,			\

	.busy_idx		= 3,			\

	.busy_idx		= 3,			\

	.idle_idx		= 2,			\

	.idle_idx		= 2,			\

	.newidle_idx		= 2,			\

	.newidle_idx		= 0,			\

	.wake_idx		= 1,			\

	.wake_idx		= 0,			\

	.forkexec_idx		= 1,			\

	.forkexec_idx		= 0,			\

	.flags			= SD_LOAD_BALANCE	\

	.flags			= SD_LOAD_BALANCE	\

				| SD_BALANCE_FORK	\

				| SD_BALANCE_FORK	\

				| SD_BALANCE_EXEC	\

				| SD_BALANCE_EXEC	\

				| SD_SERIALIZE		\

				| SD_BALANCE_NEWIDLE	\

				| SD_WAKE_BALANCE,	\

				| SD_SERIALIZE,		\

	.last_balance		= jiffies,		\

	.last_balance		= jiffies,		\

	.balance_interval	= 1,			\

	.balance_interval	= 1,			\

	.nr_balance_failed	= 0,			\

	.nr_balance_failed	= 0,			\

arch/sparc/include/asm/topology_64.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -52,13 +52,12 @@ static inline int pcibus_to_node(struct pci_bus *pbus) 
	.busy_idx		= 3,			\

	.busy_idx		= 3,			\

	.idle_idx		= 2,			\

	.idle_idx		= 2,			\

	.newidle_idx		= 0, 			\

	.newidle_idx		= 0, 			\

	.wake_idx		= 1,			\

	.wake_idx		= 0,			\

	.forkexec_idx		= 1,			\

	.forkexec_idx		= 0,			\

	.flags			= SD_LOAD_BALANCE	\

	.flags			= SD_LOAD_BALANCE	\

				| SD_BALANCE_FORK	\

				| SD_BALANCE_FORK	\

				| SD_BALANCE_EXEC	\

				| SD_BALANCE_EXEC	\

				| SD_SERIALIZE		\

				| SD_SERIALIZE,		\

				| SD_WAKE_BALANCE,	\

	.last_balance		= jiffies,		\

	.last_balance		= jiffies,		\

	.balance_interval	= 1,			\

	.balance_interval	= 1,			\

}

}