diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-18 19:36:14 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-18 19:31:54 -0500 |
commit | f34a10bd9f8cc95ebdc69a079db195636b2e22e0 (patch) | |
tree | 562479c177631a17a4a2200d13a21f72fed4317b /arch/x86/kernel | |
parent | df23cab563912ba43f7e9bc8ac517e5a2ddc9cd2 (diff) |
x86: fix warning in arch/x86/kernel/microcode_amd.c
this warning:
arch/x86/kernel/microcode_amd.c: In function ‘apply_microcode_amd’:
arch/x86/kernel/microcode_amd.c:163: warning: cast from pointer to integer of different size
arch/x86/kernel/microcode_amd.c:163: warning: cast from pointer to integer of different size
triggers because we want to pass the address to the microcode MSR,
which is 64-bit even on 32-bit. Cast it explicitly to express this.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/microcode_amd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c index 24c256f4e50a..c25fdb382292 100644 --- a/arch/x86/kernel/microcode_amd.c +++ b/arch/x86/kernel/microcode_amd.c | |||
@@ -160,7 +160,7 @@ static void apply_microcode_amd(int cpu) | |||
160 | return; | 160 | return; |
161 | 161 | ||
162 | spin_lock_irqsave(µcode_update_lock, flags); | 162 | spin_lock_irqsave(µcode_update_lock, flags); |
163 | wrmsrl(MSR_AMD64_PATCH_LOADER, &mc_amd->hdr.data_code); | 163 | wrmsrl(MSR_AMD64_PATCH_LOADER, (u64)(long)&mc_amd->hdr.data_code); |
164 | /* get patch id after patching */ | 164 | /* get patch id after patching */ |
165 | rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); | 165 | rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); |
166 | spin_unlock_irqrestore(µcode_update_lock, flags); | 166 | spin_unlock_irqrestore(µcode_update_lock, flags); |
@@ -372,3 +372,4 @@ struct microcode_ops * __init init_amd_microcode(void) | |||
372 | { | 372 | { |
373 | return µcode_amd_ops; | 373 | return µcode_amd_ops; |
374 | } | 374 | } |
375 | |||