diff options
| author | Andi Kleen <ak@linux.intel.com> | 2019-03-29 20:47:36 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-04-19 11:47:35 -0400 |
| commit | 26b31f46f036ad89de20cbbb732b76289411eddb (patch) | |
| tree | b7ff02c3e0b0561eb5d848cd15270dd319f1cb49 | |
| parent | c03e27506a564ec7db1b179e7464835901f49751 (diff) | |
x86/cpu/amd: Exclude 32bit only assembler from 64bit build
The "vide" inline assembler is only needed on 32bit kernels for old
32bit only CPUs.
Guard it with an #ifdef so it's not included in 64bit builds.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190330004743.29541-2-andi@firstfloor.org
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 1bcb489e07e7..fb6a64bd765f 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
| @@ -82,12 +82,14 @@ static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val) | |||
| 82 | * performance at the same time.. | 82 | * performance at the same time.. |
| 83 | */ | 83 | */ |
| 84 | 84 | ||
| 85 | #ifdef CONFIG_X86_32 | ||
| 85 | extern __visible void vide(void); | 86 | extern __visible void vide(void); |
| 86 | __asm__(".text\n" | 87 | __asm__(".text\n" |
| 87 | ".globl vide\n" | 88 | ".globl vide\n" |
| 88 | ".type vide, @function\n" | 89 | ".type vide, @function\n" |
| 89 | ".align 4\n" | 90 | ".align 4\n" |
| 90 | "vide: ret\n"); | 91 | "vide: ret\n"); |
| 92 | #endif | ||
| 91 | 93 | ||
| 92 | static void init_amd_k5(struct cpuinfo_x86 *c) | 94 | static void init_amd_k5(struct cpuinfo_x86 *c) |
| 93 | { | 95 | { |
