diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 17:46:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 17:46:05 -0400 |
commit | 7fda0412c5f7afdd1a5ff518f98dee5157266d8a (patch) | |
tree | d312af46758fa9b59431a479d258b54184a00591 /arch/x86 | |
parent | 6b8212a313dae341ef3a2e413dfec5c4dea59617 (diff) | |
parent | 160594e99dbbb0a5600ad922c630952c7c1c14bf (diff) |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar.
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
cpusets: Remove an unused variable
sched/rt: Improve pick_next_highest_task_rt()
sched: Fix select_fallback_rq() vs cpu_active/cpu_online
sched/x86/smp: Do not enable IRQs over calibrate_delay()
sched: Fix compiler warning about declared inline after use
MAINTAINERS: Update email address for SCHEDULER and PERF EVENTS
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 5104a2b685cf..ce13315d48fb 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -219,14 +219,9 @@ static void __cpuinit smp_callin(void) | |||
219 | * Update loops_per_jiffy in cpu_data. Previous call to | 219 | * Update loops_per_jiffy in cpu_data. Previous call to |
220 | * smp_store_cpu_info() stored a value that is close but not as | 220 | * smp_store_cpu_info() stored a value that is close but not as |
221 | * accurate as the value just calculated. | 221 | * accurate as the value just calculated. |
222 | * | ||
223 | * Need to enable IRQs because it can take longer and then | ||
224 | * the NMI watchdog might kill us. | ||
225 | */ | 222 | */ |
226 | local_irq_enable(); | ||
227 | calibrate_delay(); | 223 | calibrate_delay(); |
228 | cpu_data(cpuid).loops_per_jiffy = loops_per_jiffy; | 224 | cpu_data(cpuid).loops_per_jiffy = loops_per_jiffy; |
229 | local_irq_disable(); | ||
230 | pr_debug("Stack at about %p\n", &cpuid); | 225 | pr_debug("Stack at about %p\n", &cpuid); |
231 | 226 | ||
232 | /* | 227 | /* |