From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Oct 2008 19:42:31 +0000 (-0700)
Subject: Merge branch 'sched-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.28-rc1~725
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b11ce8a26d26ed9019a8803aa90d580b52f23e79;hp=-c;p=linux-2.6-omap-h63xx.git

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

* 'sched-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (38 commits)
  sched debug: add name to sched_domain sysctl entries
  sched: sync wakeups vs avg_overlap
  sched: remove redundant code in cpu_cgroup_create()
  sched_rt.c: resch needed in rt_rq_enqueue() for the root rt_rq
  cpusets: scan_for_empty_cpusets(), cpuset doesn't seem to be so const
  sched: minor optimizations in wake_affine and select_task_rq_fair
  sched: maintain only task entities in cfs_rq->tasks list
  sched: fixup buddy selection
  sched: more sanity checks on the bandwidth settings
  sched: add some comments to the bandwidth code
  sched: fixlet for group load balance
  sched: rework wakeup preemption
  CFS scheduler: documentation about scheduling policies
  sched: clarify ifdef tangle
  sched: fix list traversal to use _rcu variant
  sched: turn off WAKEUP_OVERLAP
  sched: wakeup preempt when small overlap
  kernel/cpu.c: create a CPU_STARTING cpu_chain notifier
  kernel/cpu.c: Move the CPU_DYING notifiers
  sched: fix __load_balance_iterator() for cfq with only one task
  ...
---

b11ce8a26d26ed9019a8803aa90d580b52f23e79
diff --combined arch/x86/kernel/smpboot.c
index 45531e3ba19,0b8261c3cac..4e7ccb0e2a9
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -88,7 -88,7 +88,7 @@@ static DEFINE_PER_CPU(struct task_struc
  #define get_idle_for_cpu(x)      (per_cpu(idle_thread_array, x))
  #define set_idle_for_cpu(x, p)   (per_cpu(idle_thread_array, x) = (p))
  #else
 -struct task_struct *idle_thread_array[NR_CPUS] __cpuinitdata ;
 +static struct task_struct *idle_thread_array[NR_CPUS] __cpuinitdata ;
  #define get_idle_for_cpu(x)      (idle_thread_array[(x)])
  #define set_idle_for_cpu(x, p)   (idle_thread_array[(x)] = (p))
  #endif
@@@ -129,7 -129,7 +129,7 @@@ static int boot_cpu_logical_apicid
  static cpumask_t cpu_sibling_setup_map;
  
  /* Set if we find a B stepping CPU */
 -int __cpuinitdata smp_b_stepping;
 +static int __cpuinitdata smp_b_stepping;
  
  #if defined(CONFIG_NUMA) && defined(CONFIG_X86_32)
  
@@@ -257,6 -257,7 +257,7 @@@ static void __cpuinit smp_callin(void
  	end_local_APIC_setup();
  	map_cpu_to_logical_apicid();
  
+ 	notify_cpu_starting(cpuid);
  	/*
  	 * Get our bogomips.
  	 *
@@@ -1313,13 -1314,16 +1314,13 @@@ __init void prefill_possible_map(void
  	if (!num_processors)
  		num_processors = 1;
  
 -#ifdef CONFIG_HOTPLUG_CPU
  	if (additional_cpus == -1) {
  		if (disabled_cpus > 0)
  			additional_cpus = disabled_cpus;
  		else
  			additional_cpus = 0;
  	}
 -#else
 -	additional_cpus = 0;
 -#endif
 +
  	possible = num_processors + additional_cpus;
  	if (possible > NR_CPUS)
  		possible = NR_CPUS;