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

Pull x86 fixes form Peter Anvin

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
arch/x86/platform/geode/net5501.c: change active_low to 0 for LED driver
x86, relocs: Remove an unused variable
asm-generic: Use __BITS_PER_LONG in statfs.h
x86/amd: Re-enable CPU topology extensions in case BIOS has disabled it

Changed files
+21 -5
arch
x86
boot
compressed
kernel
cpu
platform
geode
drivers
platform
include
asm-generic
-2
arch/x86/boot/compressed/relocs.c
··· 403 403 for (i = 0; i < ehdr.e_shnum; i++) { 404 404 struct section *sec = &secs[i]; 405 405 char *sym_strtab; 406 - Elf32_Sym *sh_symtab; 407 406 int j; 408 407 409 408 if (sec->shdr.sh_type != SHT_SYMTAB) { 410 409 continue; 411 410 } 412 - sh_symtab = sec->symtab; 413 411 sym_strtab = sec->link->strtab; 414 412 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Sym); j++) { 415 413 Elf32_Sym *sym;
+18
arch/x86/kernel/cpu/amd.c
··· 580 580 } 581 581 } 582 582 583 + /* re-enable TopologyExtensions if switched off by BIOS */ 584 + if ((c->x86 == 0x15) && 585 + (c->x86_model >= 0x10) && (c->x86_model <= 0x1f) && 586 + !cpu_has(c, X86_FEATURE_TOPOEXT)) { 587 + u64 val; 588 + 589 + if (!rdmsrl_amd_safe(0xc0011005, &val)) { 590 + val |= 1ULL << 54; 591 + wrmsrl_amd_safe(0xc0011005, val); 592 + rdmsrl(0xc0011005, val); 593 + if (val & (1ULL << 54)) { 594 + set_cpu_cap(c, X86_FEATURE_TOPOEXT); 595 + printk(KERN_INFO FW_INFO "CPU: Re-enabling " 596 + "disabled Topology Extensions Support\n"); 597 + } 598 + } 599 + } 600 + 583 601 cpu_detect_cache_sizes(c); 584 602 585 603 /* Multi core CPU? */
+1 -1
arch/x86/platform/geode/net5501.c
··· 63 63 .name = "net5501:1", 64 64 .gpio = 6, 65 65 .default_trigger = "default-on", 66 - .active_low = 1, 66 + .active_low = 0, 67 67 }, 68 68 }; 69 69
+1 -1
drivers/platform/x86/intel_mid_powerbtn.c
··· 78 78 79 79 input_set_capability(input, EV_KEY, KEY_POWER); 80 80 81 - error = request_threaded_irq(irq, NULL, mfld_pb_isr, 0, 81 + error = request_threaded_irq(irq, NULL, mfld_pb_isr, IRQF_NO_SUSPEND, 82 82 DRIVER_NAME, input); 83 83 if (error) { 84 84 dev_err(&pdev->dev, "Unable to request irq %d for mfld power"
+1 -1
include/asm-generic/statfs.h
··· 15 15 * with a 10' pole. 16 16 */ 17 17 #ifndef __statfs_word 18 - #if BITS_PER_LONG == 64 18 + #if __BITS_PER_LONG == 64 19 19 #define __statfs_word long 20 20 #else 21 21 #define __statfs_word __u32