Merge branch 'machtypes' into orion

2026-09-18 18:15:59 +00:00 · 2008-07-07 22:21:34 +01:00 · 2008-07-07 22:21:34 +01:00 · fa6868508a
commit fa6868508a
parent 5b2353859f 4ed4789693
79 changed files with 994 additions and 596 deletions
--- a/Documentation/DocBook/kgdb.tmpl
+++ b/Documentation/DocBook/kgdb.tmpl
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
--- a/6
+++ b/6
--- a/2
+++ b/2
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
--- a/arch/alpha/kernel/core_t2.c
+++ b/arch/alpha/kernel/core_t2.c
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
--- 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/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
--- a/drivers/hwmon/adt7473.c
+++ b/drivers/hwmon/adt7473.c
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.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/net/pppoe.c
+++ b/drivers/net/pppoe.c
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.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/core_mcpcia.h
+++ b/include/asm-alpha/core_mcpcia.h
--- a/include/asm-alpha/core_t2.h
+++ b/include/asm-alpha/core_t2.h
--- a/include/asm-alpha/io.h
+++ b/include/asm-alpha/io.h
--- a/include/asm-alpha/mmu_context.h
+++ b/include/asm-alpha/mmu_context.h
--- a/include/asm-alpha/percpu.h
+++ b/include/asm-alpha/percpu.h
--- a/include/asm-alpha/system.h
+++ b/include/asm-alpha/system.h
--- a/include/asm-alpha/vga.h
+++ b/include/asm-alpha/vga.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/bootmem.h
+++ b/include/linux/bootmem.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/net/ipv6.h
+++ b/include/net/ipv6.h
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.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/bootmem.c
+++ b/mm/bootmem.c
--- a/mm/memory.c
+++ b/mm/memory.c
--- a/mm/slab.c
+++ b/mm/slab.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.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