From ba9309e9ac17d9dece61b9168280bcfdd683085d Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Sun, 17 Aug 2008 21:12:27 -0700
Subject: [PATCH] --- yaml --- r: 112722 b: refs/heads/master c:
 d5e629a6f88137fb77c4cc857be5ea7c3f27110d h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/apic_64.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4babbe9fc647..b949dbc71c8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf9768d7514d59b3179a886c4a47908d72e6cf76
+refs/heads/master: d5e629a6f88137fb77c4cc857be5ea7c3f27110d
diff --git a/trunk/arch/x86/kernel/apic_64.c b/trunk/arch/x86/kernel/apic_64.c
index 5e0738131e58..ad532dccd11e 100644
--- a/trunk/arch/x86/kernel/apic_64.c
+++ b/trunk/arch/x86/kernel/apic_64.c
@@ -1446,6 +1446,7 @@ static int lapic_resume(struct sys_device *dev)
 		enable_x2apic();
 	else
 #endif
+	{
 		/*
 		 * Make sure the APICBASE points to the right address
 		 *
@@ -1456,6 +1457,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);