[kernel] r18079 - dists/squeeze/linux-2.6/debian/patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sun Sep 11 23:46:55 2011
New Revision: 18079

Log:
Make new function sched_warn_zero_power() conditional on CONFIG_SMP

sched_group and all the other changes are in #ifdef CONFIG_SMP sections.
This function was accidentally added at the end without that necessary
condition.

Modified:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/sched-work-around-sched_group-cpu_power-0.patch

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/sched-work-around-sched_group-cpu_power-0.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/sched-work-around-sched_group-cpu_power-0.patch	Sun Sep 11 22:56:08 2011	(r18078)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/sched-work-around-sched_group-cpu_power-0.patch	Sun Sep 11 23:46:55 2011	(r18079)
@@ -27,8 +27,6 @@
  enum sched_domain_level {
  	SD_LV_NONE = 0,
  	SD_LV_SIBLING,
-diff --git a/kernel/sched.c b/kernel/sched.c
-index 2829d09..93d147d 100644
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
 @@ -3804,6 +3804,7 @@ static void update_cpu_power(struct sched_domain *sd, int cpu)
@@ -85,11 +83,12 @@
  		if (group->cpu_power != SCHED_LOAD_SCALE) {
  			printk(KERN_CONT " (cpu_power = %d)",
  				group->cpu_power);
-@@ -11190,3 +11199,14 @@ void synchronize_sched_expedited(void)
+@@ -11190,3 +11199,16 @@ void synchronize_sched_expedited(void)
  EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
  
  #endif /* #else #ifndef CONFIG_SMP */
 +
++#ifdef CONFIG_SMP
 +/* Fix up and warn about group with cpu_power = 0 */
 +unsigned int sched_warn_zero_power(struct sched_group *group)
 +{
@@ -100,6 +99,7 @@
 +
 +	return SCHED_LOAD_SCALE;
 +}
++#endif
 diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
 index d53c9c7..7119d8d 100644
 --- a/kernel/sched_fair.c