From: Paul M. <le...@li...> - 2006-12-01 09:33:03
|
As 2.6.19 is now out, it's time to start thinking about what needs to go in during the 2.6.20-rc1 merge window. But first, there are some preliminary patches for kprobes and lockdep support, but these are going to need quite a bit more work, and these can be added in later, too. Given that, I've left them out of the initial queue. If anyone has new boards or CPUs that they'd like to see in 2.6.20, now would be the time to seriously consider submitting patches. I've also got some pending rework of the TMU code, and a lot of the PCI host controllers. While these aren't reflected in the queue at the moment, I anticipate they'll be completed and pushed out before the window closes. Having said that, the queue at the moment is as follows: Mark Glaisher (1): sh: dma-api channel capability extensions. Paul Mundt (22): sh: SE7206 build fixes. sh: Fixup entry-common path breakage for SH-3. sh: Configurable timer IRQ. sh: Drop CPU subtype IRQ headers. sh: Hook SH7785 in to the build system. sh: Preliminary support for SH-X2 MMU. sh: p3map_sem sem2mutex conversion. sh: Explicit endian selection support. sh: generic push-switch framework. sh: R7780RP push-switch support. sh: dma-sysfs fixes. sh: Make dma-isa depend on ISA_DMA_API. sh: Drop name overload in dma-sh. sh: Fixup 4K irq stacks. sh: Fixup various PAGE_SIZE == 4096 assumptions. sh: More flexible + SH7780 earlyprintk SCIF support. sh: Fix store queue bitmap end. sh: Get the PGD right in oops case with 64-bit PTEs. sh: Turn off IRQs around get_timer_offset() calls. sh: Clock framework tidying. sh: dyntick infrastructure. sh: Fixup movli.l/movco.l atomic ops for gcc4. Stuart Menefy (7): sh: gcc4 support. sh: Set up correct siginfo structures for page faults. sh: Use MMU.TTB register as pointer to current pgd. sh: pmd rework. sh: TLB miss fast-path optimizations. sh: KSTK_EIP/KSTK_ESP consistency. sh: Fix syscall tracing ordering. Yoshinori Sato (5): sh: Add support for SH7206 and SH7619 CPU subtypes. sh: Wire up division and address error exceptions on SH-2A. sh: Exception vector rework and SH-2/SH-2A support. sh: Add SH-2A platform headers. sh: Add support for Solution Engine 7206 and 7619 boards. arch/sh/Kconfig | 89 +++ arch/sh/Kconfig.debug | 18 arch/sh/Makefile | 22 arch/sh/boards/renesas/r7780rp/Makefile | 4 arch/sh/boards/renesas/r7780rp/irq.c | 1 arch/sh/boards/renesas/r7780rp/psw.c | 122 ++++ arch/sh/boards/se/7206/Makefile | 7 arch/sh/boards/se/7206/io.c | 123 ++++ arch/sh/boards/se/7206/irq.c | 139 +++++ arch/sh/boards/se/7206/led.c | 57 ++ arch/sh/boards/se/7206/setup.c | 79 ++ arch/sh/boards/se/7619/Makefile | 5 arch/sh/boards/se/7619/io.c | 102 +++ arch/sh/boards/se/7619/setup.c | 43 + arch/sh/boot/compressed/misc.c | 3 arch/sh/configs/se7206_defconfig | 826 +++++++++++++++++++++++++++++++ arch/sh/drivers/Kconfig | 9 arch/sh/drivers/Makefile | 2 arch/sh/drivers/dma/Makefile | 4 arch/sh/drivers/dma/dma-api.c | 274 +++++++--- arch/sh/drivers/dma/dma-sh.c | 9 arch/sh/drivers/dma/dma-sysfs.c | 23 arch/sh/drivers/pci/pci-sh7780.c | 14 arch/sh/drivers/push-switch.c | 138 +++++ arch/sh/kernel/Makefile | 2 arch/sh/kernel/cpu/Makefile | 11 arch/sh/kernel/cpu/clock.c | 27 - arch/sh/kernel/cpu/init.c | 2 arch/sh/kernel/cpu/irq/imask.c | 5 arch/sh/kernel/cpu/irq/intc2.c | 25 arch/sh/kernel/cpu/irq/ipr.c | 22 arch/sh/kernel/cpu/sh2/Makefile | 3 arch/sh/kernel/cpu/sh2/clock-sh7619.c | 81 +++ arch/sh/kernel/cpu/sh2/entry.S | 325 ++++++++++++ arch/sh/kernel/cpu/sh2/ex.S | 46 + arch/sh/kernel/cpu/sh2/probe.c | 16 arch/sh/kernel/cpu/sh2/setup-sh7619.c | 53 ++ arch/sh/kernel/cpu/sh2a/Makefile | 10 arch/sh/kernel/cpu/sh2a/clock-sh7206.c | 85 +++ arch/sh/kernel/cpu/sh2a/probe.c | 39 + arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 58 ++ arch/sh/kernel/cpu/sh3/Makefile | 2 arch/sh/kernel/cpu/sh3/clock-sh7709.c | 2 arch/sh/kernel/cpu/sh3/entry.S | 693 ++++++++++++++++++++++++++ arch/sh/kernel/cpu/sh4/Makefile | 3 arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 4 arch/sh/kernel/cpu/sh4/clock-sh7780.c | 2 arch/sh/kernel/cpu/sh4/fpu.c | 25 arch/sh/kernel/cpu/sh4/probe.c | 19 arch/sh/kernel/cpu/sh4/setup-sh7780.c | 36 - arch/sh/kernel/cpu/sh4/sq.c | 11 arch/sh/kernel/early_printk.c | 44 - arch/sh/kernel/entry-common.S | 371 ++++++++++++++ arch/sh/kernel/entry.S | 843 -------------------------------- arch/sh/kernel/head.S | 17 arch/sh/kernel/irq.c | 30 - arch/sh/kernel/process.c | 32 - arch/sh/kernel/relocate_kernel.S | 14 arch/sh/kernel/setup.c | 2 arch/sh/kernel/sh_ksyms.c | 2 arch/sh/kernel/signal.c | 36 - arch/sh/kernel/sys_sh.c | 7 arch/sh/kernel/time.c | 137 +++++ arch/sh/kernel/timers/Makefile | 2 arch/sh/kernel/timers/timer-cmt.c | 196 +++++++ arch/sh/kernel/timers/timer-mtu2.c | 200 +++++++ arch/sh/kernel/timers/timer-tmu.c | 13 arch/sh/kernel/timers/timer.c | 6 arch/sh/kernel/traps.c | 194 +++++-- arch/sh/mm/Kconfig | 72 ++ arch/sh/mm/cache-sh2.c | 69 +- arch/sh/mm/cache-sh4.c | 18 arch/sh/mm/clear_page.S | 18 arch/sh/mm/copy_page.S | 16 arch/sh/mm/fault.c | 158 ++--- arch/sh/mm/init.c | 45 - arch/sh/mm/ioremap.c | 4 arch/sh/mm/pg-dma.c | 2 arch/sh/mm/pg-sh4.c | 35 - arch/sh/tools/mach-types | 2 drivers/serial/sh-sci.c | 6 drivers/serial/sh-sci.h | 37 + include/asm-sh/atomic.h | 48 - include/asm-sh/bugs.h | 8 include/asm-sh/clock.h | 12 include/asm-sh/cpu-sh2/cache.h | 22 include/asm-sh/cpu-sh2/freq.h | 18 include/asm-sh/cpu-sh2/mmu_context.h | 16 include/asm-sh/cpu-sh2/timer.h | 6 include/asm-sh/cpu-sh2a/addrspace.h | 1 include/asm-sh/cpu-sh2a/cache.h | 39 + include/asm-sh/cpu-sh2a/cacheflush.h | 1 include/asm-sh/cpu-sh2a/dma.h | 1 include/asm-sh/cpu-sh2a/freq.h | 18 include/asm-sh/cpu-sh2a/mmu_context.h | 1 include/asm-sh/cpu-sh2a/timer.h | 1 include/asm-sh/cpu-sh2a/ubc.h | 1 include/asm-sh/cpu-sh2a/watchdog.h | 1 include/asm-sh/dma.h | 40 + include/asm-sh/elf.h | 2 include/asm-sh/entry-macros.S | 33 + include/asm-sh/irq-sh73180.h | 314 ----------- include/asm-sh/irq-sh7343.h | 317 ------------ include/asm-sh/irq-sh7780.h | 311 ----------- include/asm-sh/irq.h | 592 ---------------------- include/asm-sh/mmu_context.h | 44 - include/asm-sh/page.h | 35 + include/asm-sh/pgalloc.h | 20 include/asm-sh/pgtable-2level.h | 70 -- include/asm-sh/pgtable.h | 363 ++++++++++--- include/asm-sh/processor.h | 24 include/asm-sh/push-switch.h | 28 + include/asm-sh/se7206.h | 13 include/asm-sh/thread_info.h | 8 include/asm-sh/timer.h | 23 include/asm-sh/unistd.h | 32 - 116 files changed, 5614 insertions(+), 3197 deletions(-) |