Merge branch 'x86/debug' into x86/irq

We merge this branch because x86/debug touches code that we started cleaning up in x86/irq. The two branches started out independent, but as unexpected amount of activity went into x86/irq, they became dependent. Resolve that by this cross-merge.
2026-09-26 18:16:26 +00:00 · 2008-11-28 15:00:37 +01:00 · 2008-11-28 15:00:37 +01:00 · 3bdae4f464
commit 3bdae4f464
parent 9f1e87ea3e 5f5db59132
209 changed files with 2519 additions and 1731 deletions
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/networking/phy.txt
+++ b/Documentation/networking/phy.txt
--- a/4
+++ b/4
--- a/2
+++ b/2
--- a/arch/blackfin/include/asm/bfin-global.h
+++ b/arch/blackfin/include/asm/bfin-global.h
--- a/arch/blackfin/include/asm/dma-mapping.h
+++ b/arch/blackfin/include/asm/dma-mapping.h
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
--- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c
+++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
--- a/arch/blackfin/mach-common/cache.S
+++ b/arch/blackfin/mach-common/cache.S
--- a/arch/blackfin/mach-common/cpufreq.c
+++ b/arch/blackfin/mach-common/cpufreq.c
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
--- a/arch/blackfin/mm/sram-alloc.c
+++ b/arch/blackfin/mm/sram-alloc.c
--- a/arch/ia64/include/asm/intrinsics.h
+++ b/arch/ia64/include/asm/intrinsics.h
--- a/arch/ia64/include/asm/paravirt_privop.h
+++ b/arch/ia64/include/asm/paravirt_privop.h
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
--- a/arch/ia64/kernel/paravirt.c
+++ b/arch/ia64/kernel/paravirt.c
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
--- a/arch/ia64/xen/hypercall.S
+++ b/arch/ia64/xen/hypercall.S
--- a/arch/mips/include/asm/mach-rc32434/gpio.h
+++ b/arch/mips/include/asm/mach-rc32434/gpio.h
--- a/arch/mips/include/asm/mach-rc32434/rb.h
+++ b/arch/mips/include/asm/mach-rc32434/rb.h
--- a/arch/mips/include/asm/time.h
+++ b/arch/mips/include/asm/time.h
--- a/arch/mips/kernel/csrc-r4k.c
+++ b/arch/mips/kernel/csrc-r4k.c
--- a/arch/mips/mm/sc-ip22.c
+++ b/arch/mips/mm/sc-ip22.c
--- a/arch/mips/mti-malta/malta-amon.c
+++ b/arch/mips/mti-malta/malta-amon.c
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
--- a/arch/mips/rb532/gpio.c
+++ b/arch/mips/rb532/gpio.c
--- a/arch/parisc/kernel/ptrace.c
+++ b/arch/parisc/kernel/ptrace.c
--- a/arch/sparc/include/asm/termbits.h
+++ b/arch/sparc/include/asm/termbits.h
--- a/arch/sparc/include/asm/unistd_32.h
+++ b/arch/sparc/include/asm/unistd_32.h
--- a/arch/sparc/include/asm/unistd_64.h
+++ b/arch/sparc/include/asm/unistd_64.h
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
--- a/arch/sparc/kernel/systbls.S
+++ b/arch/sparc/kernel/systbls.S
--- a/arch/sparc64/kernel/sys32.S
+++ b/arch/sparc64/kernel/sys32.S
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/include/asm/mmzone_32.h
+++ b/arch/x86/include/asm/mmzone_32.h
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
--- a/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
--- a/arch/x86/kernel/time_64.c
+++ b/arch/x86/kernel/time_64.c
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
--- a/arch/x86/power/hibernate_32.c
+++ b/arch/x86/power/hibernate_32.c
--- a/block/blk-map.c
+++ b/block/blk-map.c
--- a/block/genhd.c
+++ b/block/genhd.c
--- a/block/ioctl.c
+++ b/block/ioctl.c
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
--- a/drivers/mfd/da903x.c
+++ b/drivers/mfd/da903x.c
--- a/drivers/mfd/wm8350-i2c.c
+++ b/drivers/mfd/wm8350-i2c.c
--- a/drivers/misc/sgi-gru/Makefile
+++ b/drivers/misc/sgi-gru/Makefile
--- a/drivers/net/atl1e/atl1e_hw.c
+++ b/drivers/net/atl1e/atl1e_hw.c
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
--- a/drivers/net/igb/igb_ethtool.c
+++ b/drivers/net/igb/igb_ethtool.c
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
--- a/drivers/net/mlx4/en_params.c
+++ b/drivers/net/mlx4/en_params.c
--- a/drivers/net/mlx4/mlx4_en.h
+++ b/drivers/net/mlx4/mlx4_en.h
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
--- a/drivers/net/niu.h
+++ b/drivers/net/niu.h
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
--- a/Show more
+++ b/Show more