diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 14:50:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 14:50:26 -0400 |
commit | 49c13b51a15f1ba9f6d47e26e4a3886c4f3931e2 (patch) | |
tree | a96d7fc5884e56a61993f9393afa9077f8068b47 /arch | |
parent | 492559af235eb56884d62553f191c0b5c4def990 (diff) | |
parent | cec9ad279b66793bee0b5009b7ca311060061efd (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (80 commits)
KVM: Use CPU_DYING for disabling virtualization
KVM: Tune hotplug/suspend IPIs
KVM: Keep track of which cpus have virtualization enabled
SMP: Allow smp_call_function_single() to current cpu
i386: Allow smp_call_function_single() to current cpu
x86_64: Allow smp_call_function_single() to current cpu
HOTPLUG: Adapt thermal throttle to CPU_DYING
HOTPLUG: Adapt cpuset hotplug callback to CPU_DYING
HOTPLUG: Add CPU_DYING notifier
KVM: Clean up #includes
KVM: Remove kvmfs in favor of the anonymous inodes source
KVM: SVM: Reliably detect if SVM was disabled by BIOS
KVM: VMX: Remove unnecessary code in vmx_tlb_flush()
KVM: MMU: Fix Wrong tlb flush order
KVM: VMX: Reinitialize the real-mode tss when entering real mode
KVM: Avoid useless memory write when possible
KVM: Fix x86 emulator writeback
KVM: Add support for in-kernel pio handlers
KVM: VMX: Fix interrupt checking on lightweight exit
KVM: Adds support for in-kernel mmio handlers
...
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/kernel/cpu/mcheck/therm_throt.c | 6 | ||||
-rw-r--r-- | arch/i386/kernel/smpcommon.c | 8 | ||||
-rw-r--r-- | arch/x86_64/kernel/smp.c | 12 |
3 files changed, 17 insertions, 9 deletions
diff --git a/arch/i386/kernel/cpu/mcheck/therm_throt.c b/arch/i386/kernel/cpu/mcheck/therm_throt.c index 7ba7c3abd3a4..1203dc5ab87a 100644 --- a/arch/i386/kernel/cpu/mcheck/therm_throt.c +++ b/arch/i386/kernel/cpu/mcheck/therm_throt.c | |||
@@ -134,19 +134,21 @@ static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb, | |||
134 | int err; | 134 | int err; |
135 | 135 | ||
136 | sys_dev = get_cpu_sysdev(cpu); | 136 | sys_dev = get_cpu_sysdev(cpu); |
137 | mutex_lock(&therm_cpu_lock); | ||
138 | switch (action) { | 137 | switch (action) { |
139 | case CPU_ONLINE: | 138 | case CPU_ONLINE: |
140 | case CPU_ONLINE_FROZEN: | 139 | case CPU_ONLINE_FROZEN: |
140 | mutex_lock(&therm_cpu_lock); | ||
141 | err = thermal_throttle_add_dev(sys_dev); | 141 | err = thermal_throttle_add_dev(sys_dev); |
142 | mutex_unlock(&therm_cpu_lock); | ||
142 | WARN_ON(err); | 143 | WARN_ON(err); |
143 | break; | 144 | break; |
144 | case CPU_DEAD: | 145 | case CPU_DEAD: |
145 | case CPU_DEAD_FROZEN: | 146 | case CPU_DEAD_FROZEN: |
147 | mutex_lock(&therm_cpu_lock); | ||
146 | thermal_throttle_remove_dev(sys_dev); | 148 | thermal_throttle_remove_dev(sys_dev); |
149 | mutex_unlock(&therm_cpu_lock); | ||
147 | break; | 150 | break; |
148 | } | 151 | } |
149 | mutex_unlock(&therm_cpu_lock); | ||
150 | return NOTIFY_OK; | 152 | return NOTIFY_OK; |
151 | } | 153 | } |
152 | 154 | ||
diff --git a/arch/i386/kernel/smpcommon.c b/arch/i386/kernel/smpcommon.c index 1868ae18eb4d..bbfe85a0f699 100644 --- a/arch/i386/kernel/smpcommon.c +++ b/arch/i386/kernel/smpcommon.c | |||
@@ -47,7 +47,7 @@ int smp_call_function(void (*func) (void *info), void *info, int nonatomic, | |||
47 | EXPORT_SYMBOL(smp_call_function); | 47 | EXPORT_SYMBOL(smp_call_function); |
48 | 48 | ||
49 | /** | 49 | /** |
50 | * smp_call_function_single - Run a function on another CPU | 50 | * smp_call_function_single - Run a function on a specific CPU |
51 | * @cpu: The target CPU. Cannot be the calling CPU. | 51 | * @cpu: The target CPU. Cannot be the calling CPU. |
52 | * @func: The function to run. This must be fast and non-blocking. | 52 | * @func: The function to run. This must be fast and non-blocking. |
53 | * @info: An arbitrary pointer to pass to the function. | 53 | * @info: An arbitrary pointer to pass to the function. |
@@ -66,9 +66,11 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
66 | int ret; | 66 | int ret; |
67 | int me = get_cpu(); | 67 | int me = get_cpu(); |
68 | if (cpu == me) { | 68 | if (cpu == me) { |
69 | WARN_ON(1); | 69 | local_irq_disable(); |
70 | func(info); | ||
71 | local_irq_enable(); | ||
70 | put_cpu(); | 72 | put_cpu(); |
71 | return -EBUSY; | 73 | return 0; |
72 | } | 74 | } |
73 | 75 | ||
74 | ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, wait); | 76 | ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, wait); |
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c index 2ff468591625..0694940b2e73 100644 --- a/arch/x86_64/kernel/smp.c +++ b/arch/x86_64/kernel/smp.c | |||
@@ -357,7 +357,7 @@ __smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
357 | } | 357 | } |
358 | 358 | ||
359 | /* | 359 | /* |
360 | * smp_call_function_single - Run a function on another CPU | 360 | * smp_call_function_single - Run a function on a specific CPU |
361 | * @func: The function to run. This must be fast and non-blocking. | 361 | * @func: The function to run. This must be fast and non-blocking. |
362 | * @info: An arbitrary pointer to pass to the function. | 362 | * @info: An arbitrary pointer to pass to the function. |
363 | * @nonatomic: Currently unused. | 363 | * @nonatomic: Currently unused. |
@@ -374,14 +374,18 @@ int smp_call_function_single (int cpu, void (*func) (void *info), void *info, | |||
374 | { | 374 | { |
375 | /* prevent preemption and reschedule on another processor */ | 375 | /* prevent preemption and reschedule on another processor */ |
376 | int me = get_cpu(); | 376 | int me = get_cpu(); |
377 | |||
378 | /* Can deadlock when called with interrupts disabled */ | ||
379 | WARN_ON(irqs_disabled()); | ||
380 | |||
377 | if (cpu == me) { | 381 | if (cpu == me) { |
382 | local_irq_disable(); | ||
383 | func(info); | ||
384 | local_irq_enable(); | ||
378 | put_cpu(); | 385 | put_cpu(); |
379 | return 0; | 386 | return 0; |
380 | } | 387 | } |
381 | 388 | ||
382 | /* Can deadlock when called with interrupts disabled */ | ||
383 | WARN_ON(irqs_disabled()); | ||
384 | |||
385 | spin_lock_bh(&call_lock); | 389 | spin_lock_bh(&call_lock); |
386 | __smp_call_function_single(cpu, func, info, nonatomic, wait); | 390 | __smp_call_function_single(cpu, func, info, nonatomic, wait); |
387 | spin_unlock_bh(&call_lock); | 391 | spin_unlock_bh(&call_lock); |