Merge branch 'linus' into x86/nmi

Conflicts: arch/x86/kernel/nmi_32.c
2026-09-26 18:16:26 +00:00 · 2008-06-16 10:17:15 +02:00 · 2008-06-16 10:17:15 +02:00 · 28638ea4f8
commit 28638ea4f8
parent f781b03c4b 066519068a
1984 changed files with 42578 additions and 21021 deletions
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
--- a/include/asm-alpha/barrier.h
+++ b/include/asm-alpha/barrier.h
--- a/include/asm-alpha/param.h
+++ b/include/asm-alpha/param.h
--- a/include/asm-alpha/pgtable.h
+++ b/include/asm-alpha/pgtable.h
--- a/include/asm-arm/arch-at91/io.h
+++ b/include/asm-arm/arch-at91/io.h
--- a/include/asm-arm/arch-omap/board-palmte.h
+++ b/include/asm-arm/arch-omap/board-palmte.h
--- a/include/asm-arm/arch-omap/clock.h
+++ b/include/asm-arm/arch-omap/clock.h
--- a/include/asm-arm/arch-omap/common.h
+++ b/include/asm-arm/arch-omap/common.h
--- a/include/asm-arm/arch-omap/control.h
+++ b/include/asm-arm/arch-omap/control.h
--- a/include/asm-arm/arch-omap/entry-macro.S
+++ b/include/asm-arm/arch-omap/entry-macro.S
--- a/include/asm-arm/arch-omap/gpio.h
+++ b/include/asm-arm/arch-omap/gpio.h
--- a/include/asm-arm/arch-omap/hardware.h
+++ b/include/asm-arm/arch-omap/hardware.h
--- a/include/asm-arm/arch-omap/mmc.h
+++ b/include/asm-arm/arch-omap/mmc.h
--- a/include/asm-arm/arch-pxa/mfp-pxa27x.h
+++ b/include/asm-arm/arch-pxa/mfp-pxa27x.h
--- a/include/asm-arm/arch-pxa/pxa2xx-gpio.h
+++ b/include/asm-arm/arch-pxa/pxa2xx-gpio.h
--- a/include/asm-arm/arch-pxa/regs-lcd.h
+++ b/include/asm-arm/arch-pxa/regs-lcd.h
--- a/include/asm-arm/arch-sa1100/collie.h
+++ b/include/asm-arm/arch-sa1100/collie.h
--- a/include/asm-arm/arch-sa1100/irqs.h
+++ b/include/asm-arm/arch-sa1100/irqs.h
--- a/include/asm-arm/hardware/locomo.h
+++ b/include/asm-arm/hardware/locomo.h
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
--- a/include/asm-arm/pgtable-nommu.h
+++ b/include/asm-arm/pgtable-nommu.h
--- a/include/asm-arm/spinlock.h
+++ b/include/asm-arm/spinlock.h
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
--- a/include/asm-blackfin/bfin-global.h
+++ b/include/asm-blackfin/bfin-global.h
--- a/include/asm-blackfin/checksum.h
+++ b/include/asm-blackfin/checksum.h
--- a/include/asm-blackfin/gpio.h
+++ b/include/asm-blackfin/gpio.h
--- a/include/asm-blackfin/io.h
+++ b/include/asm-blackfin/io.h
--- a/include/asm-blackfin/mach-bf527/anomaly.h
+++ b/include/asm-blackfin/mach-bf527/anomaly.h
--- a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf527/blackfin.h
+++ b/include/asm-blackfin/mach-bf527/blackfin.h
--- a/include/asm-blackfin/mach-bf533/anomaly.h
+++ b/include/asm-blackfin/mach-bf533/anomaly.h
--- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf537/anomaly.h
+++ b/include/asm-blackfin/mach-bf537/anomaly.h
--- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf548/anomaly.h
+++ b/include/asm-blackfin/mach-bf548/anomaly.h
--- a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf561/anomaly.h
+++ b/include/asm-blackfin/mach-bf561/anomaly.h
--- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf561/dma.h
+++ b/include/asm-blackfin/mach-bf561/dma.h
--- a/include/asm-blackfin/serial.h
+++ b/include/asm-blackfin/serial.h
--- a/include/asm-frv/checksum.h
+++ b/include/asm-frv/checksum.h
--- a/include/asm-frv/mem-layout.h
+++ b/include/asm-frv/mem-layout.h
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
--- a/include/asm-h8300/cacheflush.h
+++ b/include/asm-h8300/cacheflush.h
--- a/include/asm-h8300/param.h
+++ b/include/asm-h8300/param.h
--- a/include/asm-ia64/kvm.h
+++ b/include/asm-ia64/kvm.h
--- a/include/asm-ia64/machvec.h
+++ b/include/asm-ia64/machvec.h
--- a/include/asm-ia64/machvec_uv.h
+++ b/include/asm-ia64/machvec_uv.h
--- a/include/asm-ia64/patch.h
+++ b/include/asm-ia64/patch.h
--- a/include/asm-ia64/ptrace.h
+++ b/include/asm-ia64/ptrace.h
--- a/include/asm-ia64/sections.h
+++ b/include/asm-ia64/sections.h
--- a/include/asm-ia64/uv/uv_hub.h
+++ b/include/asm-ia64/uv/uv_hub.h
--- a/include/asm-ia64/uv/uv_mmrs.h
+++ b/include/asm-ia64/uv/uv_mmrs.h
--- a/include/asm-m32r/uaccess.h
+++ b/include/asm-m32r/uaccess.h
--- a/include/asm-m68k/bitops.h
+++ b/include/asm-m68k/bitops.h
--- a/include/asm-m68k/bug.h
+++ b/include/asm-m68k/bug.h
--- a/include/asm-m68k/io.h
+++ b/include/asm-m68k/io.h
--- a/include/asm-m68k/setup.h
+++ b/include/asm-m68k/setup.h
--- a/include/asm-m68k/uaccess.h
+++ b/include/asm-m68k/uaccess.h
--- a/include/asm-mips/bitops.h
+++ b/include/asm-mips/bitops.h
--- a/include/asm-mips/compiler.h
+++ b/include/asm-mips/compiler.h
--- a/include/asm-mips/gic.h
+++ b/include/asm-mips/gic.h
--- a/include/asm-mips/mach-au1x00/au1000.h
+++ b/include/asm-mips/mach-au1x00/au1000.h
--- a/include/asm-mips/mach-au1x00/au1000_dma.h
+++ b/include/asm-mips/mach-au1x00/au1000_dma.h
--- a/include/asm-mips/mach-au1x00/au1000_gpio.h
+++ b/include/asm-mips/mach-au1x00/au1000_gpio.h
--- a/include/asm-mips/mach-au1x00/au1550_spi.h
+++ b/include/asm-mips/mach-au1x00/au1550_spi.h
--- a/include/asm-mips/mach-au1x00/au1xxx.h
+++ b/include/asm-mips/mach-au1x00/au1xxx.h
--- a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h
+++ b/include/asm-mips/mach-au1x00/au1xxx_dbdma.h
--- a/include/asm-mips/mach-au1x00/au1xxx_ide.h
+++ b/include/asm-mips/mach-au1x00/au1xxx_ide.h
--- a/include/asm-mips/mach-au1x00/au1xxx_psc.h
+++ b/include/asm-mips/mach-au1x00/au1xxx_psc.h
--- a/include/asm-mips/mach-db1x00/db1200.h
+++ b/include/asm-mips/mach-db1x00/db1200.h
--- a/include/asm-mips/mach-db1x00/db1x00.h
+++ b/include/asm-mips/mach-db1x00/db1x00.h
--- a/include/asm-mips/mach-pb1x00/pb1000.h
+++ b/include/asm-mips/mach-pb1x00/pb1000.h
--- a/include/asm-mips/mach-pb1x00/pb1100.h
+++ b/include/asm-mips/mach-pb1x00/pb1100.h
--- a/include/asm-mips/mach-pb1x00/pb1200.h
+++ b/include/asm-mips/mach-pb1x00/pb1200.h
--- a/include/asm-mips/mach-pb1x00/pb1500.h
+++ b/include/asm-mips/mach-pb1x00/pb1500.h
--- a/include/asm-mips/mach-pb1x00/pb1550.h
+++ b/include/asm-mips/mach-pb1x00/pb1550.h
--- a/include/asm-mips/mipsregs.h
+++ b/include/asm-mips/mipsregs.h
--- a/include/asm-mips/pgtable.h
+++ b/include/asm-mips/pgtable.h
--- a/include/asm-mips/rtlx.h
+++ b/include/asm-mips/rtlx.h
--- a/include/asm-mn10300/ipcbuf.h
+++ b/include/asm-mn10300/ipcbuf.h
--- a/include/asm-parisc/assembly.h
+++ b/include/asm-parisc/assembly.h
--- a/include/asm-parisc/checksum.h
+++ b/include/asm-parisc/checksum.h
--- a/include/asm-parisc/ioctl.h
+++ b/include/asm-parisc/ioctl.h
--- a/include/asm-parisc/ioctls.h
+++ b/include/asm-parisc/ioctls.h
--- a/include/asm-parisc/termbits.h
+++ b/include/asm-parisc/termbits.h
--- a/include/asm-parisc/termios.h
+++ b/include/asm-parisc/termios.h
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
--- a/include/asm-powerpc/kvm_ppc.h
+++ b/include/asm-powerpc/kvm_ppc.h
--- a/include/asm-powerpc/mmu-hash64.h
+++ b/include/asm-powerpc/mmu-hash64.h
--- a/include/asm-powerpc/mpic.h
+++ b/include/asm-powerpc/mpic.h
--- a/include/asm-powerpc/pgtable-ppc64.h
+++ b/include/asm-powerpc/pgtable-ppc64.h
--- a/include/asm-powerpc/uaccess.h
+++ b/include/asm-powerpc/uaccess.h
--- a/include/asm-ppc/system.h
+++ b/include/asm-ppc/system.h
--- a/include/asm-s390/debug.h
+++ b/include/asm-s390/debug.h
--- a/include/asm-s390/system.h
+++ b/include/asm-s390/system.h
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
--- a/include/asm-sh/checksum_32.h
+++ b/include/asm-sh/checksum_32.h
--- a/include/asm-sh/kgdb.h
+++ b/include/asm-sh/kgdb.h
--- a/Show more
+++ b/Show more