OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c03e275
)
x86/cpu/amd: Exclude 32bit only assembler from 64bit build
author
Andi Kleen
<ak@linux.intel.com>
Sat, 30 Mar 2019 00:47:36 +0000
(17:47 -0700)
committer
Thomas Gleixner
<tglx@linutronix.de>
Fri, 19 Apr 2019 15:47:35 +0000
(17:47 +0200)
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
arch/x86/kernel/cpu/amd.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/cpu/amd.c
b/arch/x86/kernel/cpu/amd.c
index
1bcb489
..
fb6a64b
100644
(file)
--- 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)
* performance at the same time..
*/
+#ifdef CONFIG_X86_32
extern __visible void vide(void);
__asm__(".text\n"
".globl vide\n"
".type vide, @function\n"
".align 4\n"
"vide: ret\n");
+#endif
static void init_amd_k5(struct cpuinfo_x86 *c)
{