diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-12 08:40:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-12 08:40:23 -0800 |
| commit | 25a34554d600b799cbf5159bef372b02d3b4e1c6 (patch) | |
| tree | 35a6988f629f234c66b030f83e8f1485140111fb /arch/x86/kernel/microcode_amd.c | |
| parent | 28397babba4d2bb4a529859dd1f4fb9a0beb3e48 (diff) | |
| parent | 1f523bf36734375dd6e986c9f47f010d00a8caca (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, pvclock: Remove leftover scale_delta() function
x86, apic: Remove double #include
x86: Adjust section annotations in AMD Fam10 MMCONF enabling code
x86, UV: Update node controller MMRs
x86: Remove unnecessary casts of void ptr returning alloc function return values
x86: Address gcc4.6 "set but not used" warnings in apic.h
x86, mm: Fix section mismatch in tlb.c
Diffstat (limited to 'arch/x86/kernel/microcode_amd.c')
| -rw-r--r-- | arch/x86/kernel/microcode_amd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c index e1af7c055c7d..ce0cb4721c9a 100644 --- a/arch/x86/kernel/microcode_amd.c +++ b/arch/x86/kernel/microcode_amd.c @@ -212,7 +212,7 @@ static int install_equiv_cpu_table(const u8 *buf) return 0; } - equiv_cpu_table = (struct equiv_cpu_entry *) vmalloc(size); + equiv_cpu_table = vmalloc(size); if (!equiv_cpu_table) { pr_err("failed to allocate equivalent CPU table\n"); return 0; |