[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <200809231436.m8NEaNlM030319@elemente.amd.com>
Date: Wed, 17 Sep 2008 15:39:18 +0200
From: Peter Oruba <peter.oruba@....com>
To: Ingo Molnar <mingo@...e.hu>,
Dmitry Adamushko <dmitry.adamushko@...il.com>
Cc: LKML <linux-kernel@...r.kernel.org>
Subject: [RESEND] [PATCH] x86, microcode rework, v2, renaming cont.
Renaming based on patch from Dmitry Adamushko.
Further clarification by renaming define and variable related to
microcode container file.
Signed-off-by: Peter Oruba <peter.oruba@....com>
---
arch/x86/kernel/microcode_amd.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 8d97840..113be63 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -233,21 +233,20 @@ static void * get_next_ucode(u8 *buf, unsigned int size,
unsigned int *mc_size)
{
unsigned int total_size;
-#define UCODE_UNKNOWN_HDR 8
- u8 hdr[UCODE_UNKNOWN_HDR];
+#define UCODE_CONTAINER_SECTION_HDR 8
+ u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
void *mc;
- if (get_ucode_data(hdr, buf, UCODE_UNKNOWN_HDR))
+ if (get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR))
return NULL;
- if (hdr[0] != UCODE_UCODE_TYPE) {
+ if (section_hdr[0] != UCODE_UCODE_TYPE) {
printk(KERN_ERR "microcode: error! "
"Wrong microcode payload type field\n");
return NULL;
}
- /* FIXME! dimm: Why not by means of get_totalsize(hdr)? */
- total_size = (unsigned long) (hdr[4] + (hdr[5] << 8));
+ total_size = (unsigned long) (section_hdr[4] + (section_hdr[5] << 8));
printk(KERN_INFO "microcode: size %u, total_size %u\n",
size, total_size);
@@ -260,13 +259,13 @@ static void * get_next_ucode(u8 *buf, unsigned int size,
mc = vmalloc(UCODE_MAX_SIZE);
if (mc) {
memset(mc, 0, UCODE_MAX_SIZE);
- if (get_ucode_data(mc, buf + UCODE_UNKNOWN_HDR, total_size)) {
+ if (get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, total_size)) {
vfree(mc);
mc = NULL;
} else
- *mc_size = total_size + UCODE_UNKNOWN_HDR;
+ *mc_size = total_size + UCODE_CONTAINER_SECTION_HDR;
}
-#undef UCODE_UNKNOWN_HDR
+#undef UCODE_CONTAINER_SECTION_HDR
return mc;
}
--
1.5.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists