diff options
| author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2011-03-16 19:05:43 -0400 |
|---|---|---|
| committer | Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> | 2011-03-16 19:05:43 -0400 |
| commit | 729c0d86b6c58ded3118d67b80b43db60df2cb61 (patch) | |
| tree | d0b2a12b987e5ef1646330070e4e427c268063ea /arch/x86/kernel | |
| parent | b8990a400107aa236e8f9f06266a2a1854b83801 (diff) | |
idle-notifier-x86_32-fix
idle notifier x86_32 fix
- Comment cleanup
- Fix apm.c for 32-bit. Need to include asm/idle.h and need __exit_idle symbol.
Therefore, x86 64 __exit_idle must become non-static too.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/apm_32.c | 9 | ||||
| -rw-r--r-- | arch/x86/kernel/process_32.c | 10 | ||||
| -rw-r--r-- | arch/x86/kernel/process_64.c | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 1d1b58cb8d0..60939d5f226 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -236,6 +236,7 @@ #include <asm/olpc.h> #include <asm/paravirt.h> #include <asm/reboot.h> +#include <asm/idle.h> #if defined(CONFIG_APM_DISPLAY_BLANK) && defined(CONFIG_VT) extern int (*console_blank_hook)(int); @@ -953,9 +954,11 @@ recalc: original_pm_idle(); else default_idle(); - /* In many cases the interrupt that ended idle - has already called exit_idle. But some idle - loops can be woken up without interrupt. */ + /* + * In many cases the interrupt that ended idle + * has already called exit_idle. But some idle + * loops can be woken up without interrupt. + */ __exit_idle(); local_irq_disable(); jiffies_since_last_check = jiffies - last_jiffies; diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index ac50fbfed11..b4333284649 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -74,7 +74,7 @@ void enter_idle(void) notify_idle(IDLE_START); } -static void __exit_idle(void) +void __exit_idle(void) { if (x86_test_and_clear_bit_percpu(0, is_idle) == 0) return; @@ -145,9 +145,11 @@ void cpu_idle(void) pm_idle(); start_critical_timings(); - /* In many cases the interrupt that ended idle - has already called exit_idle. But some idle - loops can be woken up without interrupt. */ + /* + * In many cases the interrupt that ended idle + * has already called exit_idle. But some idle + * loops can be woken up without interrupt. + */ __exit_idle(); } tick_nohz_restart_sched_tick(); diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index fbd564ecfdc..e0361a0c8c4 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -72,7 +72,7 @@ void enter_idle(void) notify_idle(IDLE_START); } -static void __exit_idle(void) +void __exit_idle(void) { if (x86_test_and_clear_bit_percpu(0, is_idle) == 0) return; |