From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Apr 2011 19:12:58 +0000 (-0700)
Subject: Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for... 
X-Git-Tag: v2.6.39-rc3~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8b9686ff4ddfdf45662024edd567920e6db87beb;p=~shefty%2Frdma-dev.git

Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for-linus', 'irq-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-32, fpu: Fix FPU exception handling on non-SSE systems
  x86, hibernate: Initialize mmu_cr4_features during boot
  x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change
  x86: visws: Fixup irq overhaul fallout

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Clean up rebalance_domains() load-balance interval calculation

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86/mrst/vrtc: Fix boot crash in mrst_rtc_init()
  rtc, x86/mrst/vrtc: Fix boot crash in rtc_read_alarm()

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Fix cpumask leak in __setup_irq()

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf probe: Fix listing incorrect line number with inline function
  perf probe: Fix to find recursively inlined function
  perf probe: Fix multiple --vars options behavior
  perf probe: Fix to remove redundant close
  perf probe: Fix to ensure function declared file
---

8b9686ff4ddfdf45662024edd567920e6db87beb
diff --cc kernel/sched_fair.c
index 4104533d43e,3f7ec9e27ee,80ecd09452e,c7ec5c8e7b4,3f7ec9e27ee,c7ec5c8e7b4..7f00772e57c
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@@@@@@ -3849,10 -3848,10 -3860,7 -3849,10 -3848,10 -3849,10 +3860,7 @@@@@@@ static void rebalance_domains(int cpu, 
      
      		/* scale ms to jiffies */
      		interval = msecs_to_jiffies(interval);
-- ---		if (unlikely(!interval))
-- ---			interval = 1;
-  - -		if (interval > HZ*num_online_cpus()/10)
-  - -			interval = HZ*num_online_cpus()/10;
 -  - 		if (interval > HZ*NR_CPUS/10)
 -  - 			interval = HZ*NR_CPUS/10;
++ +++		interval = clamp(interval, 1UL, max_load_balance_interval);
      
      		need_serialize = sd->flags & SD_SERIALIZE;