aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/microcode.c8
-rw-r--r--include/asm-x86/microcode.h8
2 files changed, 9 insertions, 7 deletions
diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c
index 74e6a77bf190..4e7b2f65fed6 100644
--- a/arch/x86/kernel/microcode.c
+++ b/arch/x86/kernel/microcode.c
@@ -125,13 +125,7 @@ static DEFINE_SPINLOCK(microcode_update_lock);
125/* no concurrent ->write()s are allowed on /dev/cpu/microcode */ 125/* no concurrent ->write()s are allowed on /dev/cpu/microcode */
126static DEFINE_MUTEX(microcode_mutex); 126static DEFINE_MUTEX(microcode_mutex);
127 127
128static struct ucode_cpu_info { 128static struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
129 int valid;
130 unsigned int sig;
131 unsigned int pf;
132 unsigned int rev;
133 struct microcode *mc;
134} ucode_cpu_info[NR_CPUS];
135 129
136static void collect_cpu_info(int cpu_num) 130static void collect_cpu_info(int cpu_num)
137{ 131{
diff --git a/include/asm-x86/microcode.h b/include/asm-x86/microcode.h
index 1519ef0674bb..d34a1fc1b173 100644
--- a/include/asm-x86/microcode.h
+++ b/include/asm-x86/microcode.h
@@ -29,3 +29,11 @@ struct extended_sigtable {
29 unsigned int reserved[3]; 29 unsigned int reserved[3];
30 struct extended_signature sigs[0]; 30 struct extended_signature sigs[0];
31}; 31};
32
33struct ucode_cpu_info {
34 int valid;
35 unsigned int sig;
36 unsigned int pf;
37 unsigned int rev;
38 struct microcode *mc;
39};