From 69608775c42ff766c3b213c39a53033fd5d4af36 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Sun, 7 Sep 2008 17:58:51 -0700
Subject: [PATCH] --- yaml --- r: 112834 b: refs/heads/master c:
 c58606ad551e9a1c85a9bd4f1698ca41ec279b2c h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/cpu/amd_64.c | 2 --
 trunk/arch/x86/kernel/process.c    | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9824f638bac1..bd2579351e92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11fdd252bb5b461289fc5c21dc8fc87dc66f3284
+refs/heads/master: c58606ad551e9a1c85a9bd4f1698ca41ec279b2c
diff --git a/trunk/arch/x86/kernel/cpu/amd_64.c b/trunk/arch/x86/kernel/cpu/amd_64.c
index 7913e48f6739..466a1eaa81ea 100644
--- a/trunk/arch/x86/kernel/cpu/amd_64.c
+++ b/trunk/arch/x86/kernel/cpu/amd_64.c
@@ -9,8 +9,6 @@
 
 #include "cpu.h"
 
-int force_mwait __cpuinitdata;
-
 #ifdef CONFIG_NUMA
 static int __cpuinit nearby_node(int apicid)
 {
diff --git a/trunk/arch/x86/kernel/process.c b/trunk/arch/x86/kernel/process.c
index 7fc4d5b0a6a0..9f94bb1c8117 100644
--- a/trunk/arch/x86/kernel/process.c
+++ b/trunk/arch/x86/kernel/process.c
@@ -15,7 +15,6 @@ unsigned long idle_nomwait;
 EXPORT_SYMBOL(idle_nomwait);
 
 struct kmem_cache *task_xstate_cachep;
-static int force_mwait __cpuinitdata;
 
 int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
 {