diff options
author | Jesper Juhl <jj@chaosbits.net> | 2010-11-01 17:44:34 -0400 |
---|---|---|
committer | Borislav Petkov <borislav.petkov@amd.com> | 2010-11-10 08:48:57 -0500 |
commit | 1ea6be212eea5ce1e8fabadacb0c639ad87b2f00 (patch) | |
tree | 4b2b18a122a4acfc38ffcd25c7ec9835e6c5c418 | |
parent | f6614b7bb405a9b35dd28baea989a749492c46b2 (diff) |
x86, microcode, AMD: Replace vmalloc+memset with vzalloc
We don't have to do memset() ourselves after vmalloc() when we have
vzalloc(), so change that in
arch/x86/kernel/microcode_amd.c::get_next_ucode().
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
-rw-r--r-- | arch/x86/kernel/microcode_amd.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c index e1af7c055c7d..383d4f8ec9e1 100644 --- a/arch/x86/kernel/microcode_amd.c +++ b/arch/x86/kernel/microcode_amd.c | |||
@@ -183,16 +183,17 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size) | |||
183 | return NULL; | 183 | return NULL; |
184 | } | 184 | } |
185 | 185 | ||
186 | mc = vmalloc(UCODE_MAX_SIZE); | 186 | mc = vzalloc(UCODE_MAX_SIZE); |
187 | if (mc) { | 187 | if (!mc) |
188 | memset(mc, 0, UCODE_MAX_SIZE); | 188 | return NULL; |
189 | if (get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, | 189 | |
190 | total_size)) { | 190 | if (get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, total_size)) { |
191 | vfree(mc); | 191 | vfree(mc); |
192 | mc = NULL; | 192 | mc = NULL; |
193 | } else | 193 | } else { |
194 | *mc_size = total_size + UCODE_CONTAINER_SECTION_HDR; | 194 | *mc_size = total_size + UCODE_CONTAINER_SECTION_HDR; |
195 | } | 195 | } |
196 | |||
196 | return mc; | 197 | return mc; |
197 | } | 198 | } |
198 | 199 | ||