Merge branches 'sh/hwblk' and 'sh/platform-updates'

2026-09-26 18:16:26 +00:00 · 2009-07-20 04:28:11 +09:00 · 2009-07-20 04:28:11 +09:00 · c358fc46ef
commit c358fc46ef
parent 72849873cd 2094e504a7 719a72b7c7
456 changed files with 4791 additions and 4458 deletions
--- a/Documentation/driver-model/driver.txt
+++ b/Documentation/driver-model/driver.txt
--- a/Documentation/scheduler/sched-rt-group.txt
+++ b/Documentation/scheduler/sched-rt-group.txt
--- a/Documentation/x86/00-INDEX
+++ b/Documentation/x86/00-INDEX
--- a/Documentation/x86/exception-tables.txt
+++ b/Documentation/x86/exception-tables.txt
--- a/11
+++ b/11
--- a/7
+++ b/7
--- a/arch/alpha/kernel/ptrace.c
+++ b/arch/alpha/kernel/ptrace.c
--- a/arch/blackfin/kernel/ptrace.c
+++ b/arch/blackfin/kernel/ptrace.c
--- a/arch/blackfin/kernel/sys_bfin.c
+++ b/arch/blackfin/kernel/sys_bfin.c
--- a/arch/cris/kernel/sys_cris.c
+++ b/arch/cris/kernel/sys_cris.c
--- a/arch/ia64/include/asm/fpu.h
+++ b/arch/ia64/include/asm/fpu.h
--- a/arch/ia64/include/asm/xen/hypervisor.h
+++ b/arch/ia64/include/asm/xen/hypervisor.h
--- a/arch/ia64/kernel/dma-mapping.c
+++ b/arch/ia64/kernel/dma-mapping.c
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
--- a/arch/m32r/kernel/ptrace.c
+++ b/arch/m32r/kernel/ptrace.c
--- a/arch/microblaze/kernel/ptrace.c
+++ b/arch/microblaze/kernel/ptrace.c
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
--- a/arch/microblaze/kernel/sys_microblaze.c
+++ b/arch/microblaze/kernel/sys_microblaze.c
--- a/arch/mips/kernel/ptrace32.c
+++ b/arch/mips/kernel/ptrace32.c
--- a/arch/mips/mm/hugetlbpage.c
+++ b/arch/mips/mm/hugetlbpage.c
--- a/arch/mn10300/kernel/ptrace.c
+++ b/arch/mn10300/kernel/ptrace.c
--- a/arch/mn10300/kernel/signal.c
+++ b/arch/mn10300/kernel/signal.c
--- a/arch/mn10300/kernel/sys_mn10300.c
+++ b/arch/mn10300/kernel/sys_mn10300.c
--- a/arch/mn10300/kernel/traps.c
+++ b/arch/mn10300/kernel/traps.c
--- a/arch/mn10300/mm/fault.c
+++ b/arch/mn10300/mm/fault.c
--- a/arch/mn10300/mm/misalignment.c
+++ b/arch/mn10300/mm/misalignment.c
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
--- a/arch/powerpc/kernel/vector.S
+++ b/arch/powerpc/kernel/vector.S
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
--- a/arch/s390/include/asm/atomic.h
+++ b/arch/s390/include/asm/atomic.h
--- a/arch/s390/include/asm/perf_counter.h
+++ b/arch/s390/include/asm/perf_counter.h
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
--- a/arch/s390/lib/ucmpdi2.c
+++ b/arch/s390/lib/ucmpdi2.c
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
--- a/arch/sh/include/asm/hwblk.h
+++ b/arch/sh/include/asm/hwblk.h
--- a/arch/sh/include/cpu-sh4/cpu/sh7723.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7723.h
--- a/arch/sh/kernel/cpu/hwblk.c
+++ b/arch/sh/kernel/cpu/hwblk.c
--- a/arch/sh/kernel/cpu/sh4a/Makefile
+++ b/arch/sh/kernel/cpu/sh4a/Makefile
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
--- a/arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c
--- a/arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
--- a/arch/sh/mm/tlb-sh3.c
+++ b/arch/sh/mm/tlb-sh3.c
--- a/arch/sparc/kernel/ptrace_32.c
+++ b/arch/sparc/kernel/ptrace_32.c
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
--- a/arch/sparc/kernel/vio.c
+++ b/arch/sparc/kernel/vio.c
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
--- a/arch/x86/include/asm/lguest_hcall.h
+++ b/arch/x86/include/asm/lguest_hcall.h
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
--- a/arch/x86/kernel/pvclock.c
+++ b/arch/x86/kernel/pvclock.c
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
--- a/drivers/char/n_hdlc.c
+++ b/drivers/char/n_hdlc.c
--- a/drivers/char/n_r3964.c
+++ b/drivers/char/n_r3964.c
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
--- a/Show more
+++ b/Show more