|
@@ -50,7 +50,7 @@
|
|
|
#include "sigframe.h"
|
|
|
|
|
|
void (*ia64_mark_idle)(int);
|
|
|
-static cpumask_t cpu_idle_map;
|
|
|
+static DEFINE_PER_CPU(unsigned int, cpu_idle_state);
|
|
|
|
|
|
unsigned long boot_option_idle_override = 0;
|
|
|
EXPORT_SYMBOL(boot_option_idle_override);
|
|
@@ -223,20 +223,31 @@ static inline void play_dead(void)
|
|
|
}
|
|
|
#endif /* CONFIG_HOTPLUG_CPU */
|
|
|
|
|
|
-
|
|
|
void cpu_idle_wait(void)
|
|
|
{
|
|
|
- int cpu;
|
|
|
- cpumask_t map;
|
|
|
+ unsigned int cpu, this_cpu = get_cpu();
|
|
|
+ cpumask_t map;
|
|
|
+
|
|
|
+ set_cpus_allowed(current, cpumask_of_cpu(this_cpu));
|
|
|
+ put_cpu();
|
|
|
|
|
|
- for_each_online_cpu(cpu)
|
|
|
- cpu_set(cpu, cpu_idle_map);
|
|
|
+ cpus_clear(map);
|
|
|
+ for_each_online_cpu(cpu) {
|
|
|
+ per_cpu(cpu_idle_state, cpu) = 1;
|
|
|
+ cpu_set(cpu, map);
|
|
|
+ }
|
|
|
|
|
|
- wmb();
|
|
|
- do {
|
|
|
- ssleep(1);
|
|
|
- cpus_and(map, cpu_idle_map, cpu_online_map);
|
|
|
- } while (!cpus_empty(map));
|
|
|
+ __get_cpu_var(cpu_idle_state) = 0;
|
|
|
+
|
|
|
+ wmb();
|
|
|
+ do {
|
|
|
+ ssleep(1);
|
|
|
+ for_each_online_cpu(cpu) {
|
|
|
+ if (cpu_isset(cpu, map) && !per_cpu(cpu_idle_state, cpu))
|
|
|
+ cpu_clear(cpu, map);
|
|
|
+ }
|
|
|
+ cpus_and(map, map, cpu_online_map);
|
|
|
+ } while (!cpus_empty(map));
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(cpu_idle_wait);
|
|
|
|
|
@@ -244,7 +255,6 @@ void __attribute__((noreturn))
|
|
|
cpu_idle (void)
|
|
|
{
|
|
|
void (*mark_idle)(int) = ia64_mark_idle;
|
|
|
- int cpu = smp_processor_id();
|
|
|
|
|
|
/* endless idle loop with no priority at all */
|
|
|
while (1) {
|
|
@@ -255,12 +265,13 @@ cpu_idle (void)
|
|
|
while (!need_resched()) {
|
|
|
void (*idle)(void);
|
|
|
|
|
|
+ if (__get_cpu_var(cpu_idle_state))
|
|
|
+ __get_cpu_var(cpu_idle_state) = 0;
|
|
|
+
|
|
|
+ rmb();
|
|
|
if (mark_idle)
|
|
|
(*mark_idle)(1);
|
|
|
|
|
|
- if (cpu_isset(cpu, cpu_idle_map))
|
|
|
- cpu_clear(cpu, cpu_idle_map);
|
|
|
- rmb();
|
|
|
idle = pm_idle;
|
|
|
if (!idle)
|
|
|
idle = default_idle;
|