Merge branch 'linus' into core/softirq

2026-09-24 18:16:04 +00:00 · 2008-06-25 12:23:59 +02:00 · 2008-06-25 12:23:59 +02:00 · ace7f1b796
commit ace7f1b796
parent a60b33cf59 543cf4cb3f
49 changed files with 646 additions and 499 deletions
--- a/Documentation/DocBook/kgdb.tmpl
+++ b/Documentation/DocBook/kgdb.tmpl
--- a/2
+++ b/2
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
--- a/arch/x86/kernel/pvclock.c
+++ b/arch/x86/kernel/pvclock.c
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
--- a/arch/x86/xen/mmu.h
+++ b/arch/x86/xen/mmu.h
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/char/drm/i915_drv.c
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
--- a/fs/nfs/mount_clnt.c
+++ b/fs/nfs/mount_clnt.c
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
--- a/fs/select.c
+++ b/fs/select.c
--- a/include/asm-alpha/percpu.h
+++ b/include/asm-alpha/percpu.h
--- a/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
--- a/include/asm-x86/kvm_para.h
+++ b/include/asm-x86/kvm_para.h
--- a/include/asm-x86/pvclock-abi.h
+++ b/include/asm-x86/pvclock-abi.h
--- a/include/asm-x86/pvclock.h
+++ b/include/asm-x86/pvclock.h
--- a/include/asm-x86/xen/page.h
+++ b/include/asm-x86/xen/page.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
--- a/kernel/futex.c
+++ b/kernel/futex.c
--- a/kernel/kgdb.c
+++ b/kernel/kgdb.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
--- a/mm/memory.c
+++ b/mm/memory.c
--- a/sound/isa/sb/sb_mixer.c
+++ b/sound/isa/sb/sb_mixer.c
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c