diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-12 22:48:01 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-12 22:48:01 -0400 |
| commit | e290861f99131fc42d98012a9ea2dc185f08f8f9 (patch) | |
| tree | 5c8b92d095d74d03b281711c81bac54bd59989cd /arch/x86/kernel/apm_32.c | |
| parent | b4a757367d36cebddcd332a4024d92f1e87af370 (diff) | |
| parent | dbefd606a3b3634799b625f4900336e61c89e868 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/x86/kernel/apm_32.c')
| -rw-r--r-- | arch/x86/kernel/apm_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 79302e9a33a4..442b5508893f 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
| @@ -811,7 +811,7 @@ static int apm_do_idle(void) | |||
| 811 | u8 ret = 0; | 811 | u8 ret = 0; |
| 812 | int idled = 0; | 812 | int idled = 0; |
| 813 | int polling; | 813 | int polling; |
| 814 | int err; | 814 | int err = 0; |
| 815 | 815 | ||
| 816 | polling = !!(current_thread_info()->status & TS_POLLING); | 816 | polling = !!(current_thread_info()->status & TS_POLLING); |
| 817 | if (polling) { | 817 | if (polling) { |