Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Enable NMI on all cpus on UV vgaarb: Add user selectability of the number of GPUS in a system vgaarb: Fix VGA arbiter to accept PCI domains other than 0 x86, uv: Update UV arch to target Legacy VGA I/O correctly. pci: Update pci_set_vga_state() to call arch functions
Showing
- arch/x86/include/asm/uv/bios.h 3 additions, 1 deletionarch/x86/include/asm/uv/bios.h
- arch/x86/include/asm/uv/uv.h 1 addition, 0 deletionsarch/x86/include/asm/uv/uv.h
- arch/x86/include/asm/x86_init.h 2 additions, 0 deletionsarch/x86/include/asm/x86_init.h
- arch/x86/kernel/apic/x2apic_uv_x.c 74 additions, 0 deletionsarch/x86/kernel/apic/x2apic_uv_x.c
- arch/x86/kernel/bios_uv.c 19 additions, 0 deletionsarch/x86/kernel/bios_uv.c
- arch/x86/kernel/smpboot.c 1 addition, 0 deletionsarch/x86/kernel/smpboot.c
- arch/x86/kernel/x86_init.c 3 additions, 0 deletionsarch/x86/kernel/x86_init.c
- drivers/gpu/vga/Kconfig 8 additions, 0 deletionsdrivers/gpu/vga/Kconfig
- drivers/gpu/vga/vgaarb.c 21 additions, 6 deletionsdrivers/gpu/vga/vgaarb.c
- drivers/pci/pci.c 24 additions, 1 deletiondrivers/pci/pci.c
- include/linux/pci.h 5 additions, 0 deletionsinclude/linux/pci.h
Loading
Please register or sign in to comment