diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
| commit | e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c (patch) | |
| tree | 31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9 /arch/x86/kernel/apm_32.c | |
| parent | 8b5a10fc6fd02289ea03480f93382b1a99006142 (diff) | |
| parent | c62e43202e7cf50ca24bce58b255df7bf5de69d0 (diff) | |
Merge commit 'origin/x86/urgent' into x86/asm
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 39a4462ef8a7..151ace69a5aa 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
| @@ -819,7 +819,7 @@ static int apm_do_idle(void) | |||
| 819 | u8 ret = 0; | 819 | u8 ret = 0; |
| 820 | int idled = 0; | 820 | int idled = 0; |
| 821 | int polling; | 821 | int polling; |
| 822 | int err; | 822 | int err = 0; |
| 823 | 823 | ||
| 824 | polling = !!(current_thread_info()->status & TS_POLLING); | 824 | polling = !!(current_thread_info()->status & TS_POLLING); |
| 825 | if (polling) { | 825 | if (polling) { |