diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-18 18:46:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-19 02:07:20 +0200 |
| commit | e75bedf415f300a08e9bbcc755784e488574a73e (patch) | |
| tree | e98b2096bd7d53cda7fe85805566100aa84b52b0 | |
| parent | x86: apic - rearrange parse_lapic_timer_c2_ok (diff) | |
| download | linux-e75bedf415f300a08e9bbcc755784e488574a73e.tar.xz linux-e75bedf415f300a08e9bbcc755784e488574a73e.zip | |
x86: apic - lapic_resume 32bit - unification fix
Just add parenthesis to be identical of current
64bit implementation (so diff will not complain).
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/apic_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 885e306420ac..e975562a76a5 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -1646,6 +1646,7 @@ static int lapic_resume(struct sys_device *dev) enable_x2apic(); else #endif + { /* * Make sure the APICBASE points to the right address * @@ -1656,6 +1657,7 @@ static int lapic_resume(struct sys_device *dev) l &= ~MSR_IA32_APICBASE_BASE; l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr; wrmsr(MSR_IA32_APICBASE, l, h); + } apic_write(APIC_LVTERR, ERROR_APIC_VECTOR | APIC_LVT_MASKED); apic_write(APIC_ID, apic_pm_state.apic_id); |