From e860d4ee5355f5391886703a80b4f0cd1a4bc6fa Mon Sep 17 00:00:00 2001
From: Peter Oruba <peter.oruba@amd.com>
Date: Mon, 28 Jul 2008 18:44:15 +0200
Subject: [PATCH] --- yaml --- r: 113314 b: refs/heads/master c:
 c3b71bcec0380836caac9b524fa1585b469b7456 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/microcode.c | 8 +-------
 trunk/include/asm-x86/microcode.h | 8 ++++++++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 6163f4229838..780aabee4bff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e61028dfdc6b8ca996abfe8f9baef6792ea2904
+refs/heads/master: c3b71bcec0380836caac9b524fa1585b469b7456
diff --git a/trunk/arch/x86/kernel/microcode.c b/trunk/arch/x86/kernel/microcode.c
index 74e6a77bf190..4e7b2f65fed6 100644
--- a/trunk/arch/x86/kernel/microcode.c
+++ b/trunk/arch/x86/kernel/microcode.c
@@ -125,13 +125,7 @@ static DEFINE_SPINLOCK(microcode_update_lock);
 /* no concurrent ->write()s are allowed on /dev/cpu/microcode */
 static DEFINE_MUTEX(microcode_mutex);
 
-static struct ucode_cpu_info {
-	int valid;
-	unsigned int sig;
-	unsigned int pf;
-	unsigned int rev;
-	struct microcode *mc;
-} ucode_cpu_info[NR_CPUS];
+static struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
 
 static void collect_cpu_info(int cpu_num)
 {
diff --git a/trunk/include/asm-x86/microcode.h b/trunk/include/asm-x86/microcode.h
index 1519ef0674bb..d34a1fc1b173 100644
--- a/trunk/include/asm-x86/microcode.h
+++ b/trunk/include/asm-x86/microcode.h
@@ -29,3 +29,11 @@ struct extended_sigtable {
 	unsigned int            reserved[3];
 	struct extended_signature sigs[0];
 };
+
+struct ucode_cpu_info {
+	int valid;
+	unsigned int sig;
+	unsigned int pf;
+	unsigned int rev;
+	struct microcode *mc;
+};