x86/cpu: Move X86_BUG_ESPFIX initialization to generic_identify()

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / cpu / amd.c

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 68fe8d3bed561096f9609d5cd5b485c69ea65217..6e47e3a916f12a03069a7c38ef21e9b2df5edcdf 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -75,7 +75,10 @@ static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val)
  */
 
 extern __visible void vide(void);
-__asm__(".globl vide\n\t.align 4\nvide: ret");
+__asm__(".globl vide\n"
+       ".type vide, @function\n"
+       ".align 4\n"
+       "vide: ret\n");
 
 static void init_amd_k5(struct cpuinfo_x86 *c)
 {