aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/microcode_amd.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-14 08:50:26 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-14 08:53:00 -0400
commita1c75cc5018f17ff6d80ce45a13435b1536f76db (patch)
tree2b6e394379fe2035f26c4853b4cd462019b9e0a4 /arch/x86/kernel/microcode_amd.c
parenta0a29b62a9cac6b7d83b7514679f2ed8d33d4372 (diff)
x86, microcode rework, v2, fix
based on patch from Dmitry Adamushko. - add missing vfree() - update debug printks Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/microcode_amd.c')
-rw-r--r--arch/x86/kernel/microcode_amd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 6815837a7753..48aec9f48e4f 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -92,7 +92,7 @@ static int get_matching_microcode(int cpu, void *mc, int rev)
92 unsigned int i = 0; 92 unsigned int i = 0;
93 93
94 /* 94 /*
95 * dimm: do we need this? Why an update via /dev/... is different 95 * FIXME! dimm: do we need this? Why an update via /dev/... is different
96 * from the one via firmware? 96 * from the one via firmware?
97 * 97 *
98 * This is a tricky part. We might be called from a write operation 98 * This is a tricky part. We might be called from a write operation
@@ -246,7 +246,7 @@ static void * get_next_ucode(u8 *buf, unsigned int size,
246 return NULL; 246 return NULL;
247 } 247 }
248 248
249 /* Why not by means of get_totalsize(hdr)? */ 249 /* FIXME! dimm: Why not by means of get_totalsize(hdr)? */
250 total_size = (unsigned long) (hdr[4] + (hdr[5] << 8)); 250 total_size = (unsigned long) (hdr[4] + (hdr[5] << 8));
251 251
252 printk(KERN_INFO "microcode: size %u, total_size %u\n", 252 printk(KERN_INFO "microcode: size %u, total_size %u\n",
@@ -342,6 +342,8 @@ static int generic_load_microcode(int cpu, void *data, size_t size,
342 342
343 mc_header = (struct microcode_header_amd *)mc; 343 mc_header = (struct microcode_header_amd *)mc;
344 if (get_matching_microcode(cpu, mc, new_rev)) { 344 if (get_matching_microcode(cpu, mc, new_rev)) {
345 if (new_mc)
346 vfree(new_mc);
345 new_rev = mc_header->patch_id; 347 new_rev = mc_header->patch_id;
346 new_mc = mc; 348 new_mc = mc;
347 } else 349 } else