Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 cpu feature fixes from Ingo Molnar:
 "Two small cpufeature support updates"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Fix override new_cpu_data.x86 with 486
  x86, cpufeature: Use new CC_HAVE_ASM_GOTO

diff --combined arch/x86/kernel/head_32.S
index 5dd87a89f011d89d5098fc582e794c5250fce3dd,fe79573c84b9cbe815e6b916ea02bf7269fbd3a5..81ba27679f18ec6100bd167c3739608631a7c475
--- 1/arch/x86/kernel/head_32.S
--- 2/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@@ -292,6 -292,7 +292,6 @@@ ENDPROC(start_cpu0
   * If cpu hotplug is not supported then this code can go in init section
   * which will be freed later
   */
 -__CPUINIT
  ENTRY(startup_32_smp)
        cld
        movl $(__BOOT_DS),%eax
@@@ -409,6 -410,7 +409,7 @@@ enable_paging
  /*
   * Check if it is 486
   */
+       movb $4,X86                     # at least 486
        cmpl $-1,X86_CPUID
        je is486
  
@@@ -436,7 -438,6 +437,6 @@@
        movl %edx,X86_CAPABILITY
  
  is486:
-       movb $4,X86
        movl $0x50022,%ecx      # set AM, WP, NE and MP
        movl %cr0,%eax
        andl $0x80000011,%eax   # Save PG,PE,ET