[patch 04/11] [PATCH 04/11] x86: Moved per CPU microcode structure declaration to header file.

Peter Oruba
2008-07-28T16:47:21Z

[-- Attachment #1: 0004-x86-Moved-per-CPU-microcode-structure-declaration-t.patch --]
[-- Type: text/plain, Size: 1348 bytes --]

This structure will be later used by other modules as well and
needs therfore to be moved out to a header file.

Signed-off-by: Peter Oruba <peter.oruba@amd.com>
---
arch/x86/kernel/microcode.c | 8 +-------
include/asm-x86/microcode.h | 8 ++++++++
2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c
index 74e6a77..4e7b2f6 100644
--- a/arch/x86/kernel/microcode.c
+++ b/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/include/asm-x86/microcode.h b/include/asm-x86/microcode.h
index 1519ef0..d34a1fc 100644
--- a/include/asm-x86/microcode.h
+++ b/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;
+};
--
1.5.4.5