Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (197 commits)
  sh: add spi header and r2d platform data V3
  sh: update r7780rp interrupt code
  sh: remove consistent alloc stuff from the machine vector
  sh: use declared coherent memory for dreamcast pci ethernet adapter
  sh: declared coherent memory support V2
  sh: Add support for SDK7780 board.
  sh: constify function pointer tables
  sh: Kill off -traditional for linker script.
  cdrom: Add support for Sega Dreamcast GD-ROM.
  sh: Kill off hs7751rvoip reference from arch/sh/Kconfig.
  sh: Drop r7780rp_defconfig, use r7780mp_defconfig as kbuild default.
  sh: Kill off dead HS771RVoIP board support.
  sh: r7785rp: Fix up DECLARE_INTC_DESC() arg mismatch.
  sh: r7785rp: Hook up the rest of the HL7785 FPGA IRQ vectors.
  sh: r2d - enable sm501 usb host function
  sh: remove voyagergx
  sh: r2d - add lcd planel timings to sm501 platform data
  sh: Add OHCI and UDC platform devices for SH7720.
  sh: intc - remove default interrupt priority tables
  sh: Correct pte size mismatch for X2 TLB.
  ...

418 files changed, 13143 insertions, 18451 deletions

diff --git a/Makefile b/Makefile
index 189d8ef416e6..6d419f67939c 100644
--- a/Makefile
+++ b/Makefile
@@ -169,7 +169,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
                                   -e s/arm.*/arm/ -e s/sa110/arm/ \
                                   -e s/s390x/s390/ -e s/parisc64/parisc/ \
                                   -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-                                  -e s/sh[234].*/sh/ )
+                                  -e s/sh.*/sh/ )
 
 # Cross compiling and selecting different set of gcc/bin-utils
 # ---------------------------------------------------------------------------
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 496d635f89b2..1cd9c8fd927d 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -6,8 +6,7 @@
 mainmenu "Linux/SuperH Kernel Configuration"
 
 config SUPERH
-        bool
-        default y
+        def_bool y
         select EMBEDDED
         help
           The SuperH is a RISC processor targeted for use in embedded systems
@@ -15,36 +14,36 @@ config SUPERH
           gaming console.  The SuperH port has a home page at
           <http://www.linux-sh.org/>.
 
+config SUPERH32
+        def_bool !SUPERH64
+
+config SUPERH64
+        def_bool y if CPU_SH5
+
 config RWSEM_GENERIC_SPINLOCK
-        bool
-        default y
+        def_bool y
 
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
 config GENERIC_BUG
         def_bool y
-        depends on BUG
+        depends on BUG && SUPERH32
 
 config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
+        def_bool y
 
 config GENERIC_HWEIGHT
-        bool
-        default y
+        def_bool y
 
 config GENERIC_HARDIRQS
-        bool
-        default y
+        def_bool y
 
 config GENERIC_IRQ_PROBE
-        bool
-        default y
+        def_bool y
 
 config GENERIC_CALIBRATE_DELAY
-        bool
-        default y
+        def_bool y
 
 config GENERIC_IOMAP
         bool
@@ -75,20 +74,16 @@ config ARCH_MAY_HAVE_PC_FDC
         bool
 
 config STACKTRACE_SUPPORT
-        bool
-        default y
+        def_bool y
 
 config LOCKDEP_SUPPORT
-        bool
-        default y
+        def_bool y
 
 config ARCH_HAS_ILOG2_U32
-        bool
-        default n
+        def_bool n
 
 config ARCH_HAS_ILOG2_U64
-        bool
-        default n
+        def_bool n
 
 config ARCH_NO_VIRT_TO_BUS
         def_bool y
@@ -97,110 +92,234 @@ source "init/Kconfig"
 
 menu "System type"
 
-source "arch/sh/mm/Kconfig"
+#
+# Processor families
+#
+config CPU_SH2
+        bool
 
-menu "Processor features"
+config CPU_SH2A
+        bool
+        select CPU_SH2
+
+config CPU_SH3
+        bool
+        select CPU_HAS_INTEVT
+        select CPU_HAS_SR_RB
+
+config CPU_SH4
+        bool
+        select CPU_HAS_INTEVT
+        select CPU_HAS_SR_RB
+        select CPU_HAS_PTEA if !CPU_SH4A || CPU_SHX2
+        select CPU_HAS_FPU if !CPU_SH4AL_DSP
+
+config CPU_SH4A
+        bool
+        select CPU_SH4
+
+config CPU_SH4AL_DSP
+        bool
+        select CPU_SH4A
+        select CPU_HAS_DSP
+
+config CPU_SH5
+        bool
+        select CPU_HAS_FPU
+
+config CPU_SHX2
+        bool
+
+config CPU_SHX3
+        bool
 
 choice
-        prompt "Endianess selection" 
-        default CPU_LITTLE_ENDIAN
-        help
-          Some SuperH machines can be configured for either little or big
-          endian byte order. These modes require different kernels.
+        prompt "Processor sub-type selection"
 
-config CPU_LITTLE_ENDIAN
-        bool "Little Endian"
+#
+# Processor subtypes
+#
 
-config CPU_BIG_ENDIAN
-        bool "Big Endian"
+# SH-2 Processor Support
 
-endchoice
+config CPU_SUBTYPE_SH7619
+        bool "Support SH7619 processor"
+        select CPU_SH2
+
+# SH-2A Processor Support
+
+config CPU_SUBTYPE_SH7203
+        bool "Support SH7203 processor"
+        select CPU_SH2A
+        select CPU_HAS_FPU
+
+config CPU_SUBTYPE_SH7206
+        bool "Support SH7206 processor"
+        select CPU_SH2A
 
-config SH_FPU
-        bool "FPU support"
-        depends on CPU_HAS_FPU
-        default y
+config CPU_SUBTYPE_SH7263
+        bool "Support SH7263 processor"
+        select CPU_SH2A
+        select CPU_HAS_FPU
+
+# SH-3 Processor Support
+
+config CPU_SUBTYPE_SH7705
+        bool "Support SH7705 processor"
+        select CPU_SH3
+
+config CPU_SUBTYPE_SH7706
+        bool "Support SH7706 processor"
+        select CPU_SH3
         help
-          Selecting this option will enable support for SH processors that
-          have FPU units (ie, SH77xx).
+          Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU.
 
-          This option must be set in order to enable the FPU.
+config CPU_SUBTYPE_SH7707
+        bool "Support SH7707 processor"
+        select CPU_SH3
+        help
+          Select SH7707 if you have a  60 Mhz SH-3 HD6417707 CPU.
 
-config SH_FPU_EMU
-        bool "FPU emulation support"
-        depends on !SH_FPU && EXPERIMENTAL
-        default n
+config CPU_SUBTYPE_SH7708
+        bool "Support SH7708 processor"
+        select CPU_SH3
         help
-          Selecting this option will enable support for software FPU emulation.
-          Most SH-3 users will want to say Y here, whereas most SH-4 users will
-          want to say N.
+          Select SH7708 if you have a  60 Mhz SH-3 HD6417708S or
+          if you have a 100 Mhz SH-3 HD6417708R CPU.
 
-config SH_DSP
-        bool "DSP support"
-        depends on CPU_HAS_DSP
-        default y
+config CPU_SUBTYPE_SH7709
+        bool "Support SH7709 processor"
+        select CPU_SH3
         help
-          Selecting this option will enable support for SH processors that
-          have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
+          Select SH7709 if you have a  80 Mhz SH-3 HD6417709 CPU.
 
-          This option must be set in order to enable the DSP.
+config CPU_SUBTYPE_SH7710
+        bool "Support SH7710 processor"
+        select CPU_SH3
+        select CPU_HAS_DSP
+        help
+          Select SH7710 if you have a SH3-DSP SH7710 CPU.
 
-config SH_ADC
-        bool "ADC support"
-        depends on CPU_SH3
-        default y
+config CPU_SUBTYPE_SH7712
+        bool "Support SH7712 processor"
+        select CPU_SH3
+        select CPU_HAS_DSP
         help
-          Selecting this option will allow the Linux kernel to use SH3 on-chip
-          ADC module.
+          Select SH7712 if you have a SH3-DSP SH7712 CPU.
 
-          If unsure, say N.
+config CPU_SUBTYPE_SH7720
+        bool "Support SH7720 processor"
+        select CPU_SH3
+        select CPU_HAS_DSP
+        help
+          Select SH7720 if you have a SH3-DSP SH7720 CPU.
 
-config SH_STORE_QUEUES
-        bool "Support for Store Queues"
-        depends on CPU_SH4
+config CPU_SUBTYPE_SH7721
+        bool "Support SH7721 processor"
+        select CPU_SH3
+        select CPU_HAS_DSP
         help
-          Selecting this option will enable an in-kernel API for manipulating
-          the store queues integrated in the SH-4 processors.
+          Select SH7721 if you have a SH3-DSP SH7721 CPU.
 
-config SPECULATIVE_EXECUTION
-        bool "Speculative subroutine return"
-        depends on CPU_SUBTYPE_SH7780 && EXPERIMENTAL
+# SH-4 Processor Support
+
+config CPU_SUBTYPE_SH7750
+        bool "Support SH7750 processor"
+        select CPU_SH4
         help
-          This enables support for a speculative instruction fetch for
-          subroutine return. There are various pitfalls associated with
-          this, as outlined in the SH7780 hardware manual.
+          Select SH7750 if you have a 200 Mhz SH-4 HD6417750 CPU.
 
-          If unsure, say N.
+config CPU_SUBTYPE_SH7091
+        bool "Support SH7091 processor"
+        select CPU_SH4
+        help
+          Select SH7091 if you have an SH-4 based Sega device (such as
+          the Dreamcast, Naomi, and Naomi 2).
 
-config CPU_HAS_INTEVT
-        bool
+config CPU_SUBTYPE_SH7750R
+        bool "Support SH7750R processor"
+        select CPU_SH4
 
-config CPU_HAS_MASKREG_IRQ
-        bool
+config CPU_SUBTYPE_SH7750S
+        bool "Support SH7750S processor"
+        select CPU_SH4
 
-config CPU_HAS_IPR_IRQ
-        bool
+config CPU_SUBTYPE_SH7751
+        bool "Support SH7751 processor"
+        select CPU_SH4
+        help
+          Select SH7751 if you have a 166 Mhz SH-4 HD6417751 CPU,
+          or if you have a HD6417751R CPU.
 
-config CPU_HAS_SR_RB
-        bool
+config CPU_SUBTYPE_SH7751R
+        bool "Support SH7751R processor"
+        select CPU_SH4
+
+config CPU_SUBTYPE_SH7760
+        bool "Support SH7760 processor"
+        select CPU_SH4
+
+config CPU_SUBTYPE_SH4_202
+        bool "Support SH4-202 processor"
+        select CPU_SH4
+
+# SH-4A Processor Support
+
+config CPU_SUBTYPE_SH7763
+        bool "Support SH7763 processor"
+        select CPU_SH4A
         help
-          This will enable the use of SR.RB register bank usage. Processors
-          that are lacking this bit must have another method in place for
-          accomplishing what is taken care of by the banked registers.
+          Select SH7763 if you have a SH4A SH7763(R5S77631) CPU.
 
-          See <file:Documentation/sh/register-banks.txt> for further
-          information on SR.RB and register banking in the kernel in general.
+config CPU_SUBTYPE_SH7770
+        bool "Support SH7770 processor"
+        select CPU_SH4A
 
-config CPU_HAS_PTEA
-        bool
+config CPU_SUBTYPE_SH7780
+        bool "Support SH7780 processor"
+        select CPU_SH4A
 
-config CPU_HAS_DSP
-        bool
+config CPU_SUBTYPE_SH7785
+        bool "Support SH7785 processor"
+        select CPU_SH4A
+        select CPU_SHX2
+        select ARCH_SPARSEMEM_ENABLE
+        select SYS_SUPPORTS_NUMA
 
-config CPU_HAS_FPU
-        bool
+config CPU_SUBTYPE_SHX3
+        bool "Support SH-X3 processor"
+        select CPU_SH4A
+        select CPU_SHX3
+        select ARCH_SPARSEMEM_ENABLE
+        select SYS_SUPPORTS_NUMA
+        select SYS_SUPPORTS_SMP
 
-endmenu
+# SH4AL-DSP Processor Support
+
+config CPU_SUBTYPE_SH7343
+        bool "Support SH7343 processor"
+        select CPU_SH4AL_DSP
+
+config CPU_SUBTYPE_SH7722
+        bool "Support SH7722 processor"
+        select CPU_SH4AL_DSP
+        select CPU_SHX2
+        select ARCH_SPARSEMEM_ENABLE
+        select SYS_SUPPORTS_NUMA
+
+# SH-5 Processor Support
+
+config CPU_SUBTYPE_SH5_101
+        bool "Support SH5-101 processor"
+        select CPU_SH5
+
+config CPU_SUBTYPE_SH5_103
+        bool "Support SH5-103 processor"
+
+endchoice
+
+source "arch/sh/mm/Kconfig"
+source "arch/sh/Kconfig.cpu"
 
 menu "Board support"
 
@@ -321,13 +440,6 @@ config SH_SECUREEDGE5410
           This includes both the OEM SecureEdge products as well as the
           SME product line.
 
-config SH_HS7751RVOIP
-        bool "HS7751RVOIP"
-        depends on CPU_SUBTYPE_SH7751R
-        help
-          Select HS7751RVOIP if configuring for a Renesas Technology
-          Sales VoIP board.
-
 config SH_7710VOIPGW
         bool "SH7710-VOIP-GW"
         depends on CPU_SUBTYPE_SH7710
@@ -343,6 +455,14 @@ config SH_RTS7751R2D
           Select RTS7751R2D if configuring for a Renesas Technology
           Sales SH-Graphics board.
 
+config SH_SDK7780
+        bool "SDK7780R3"
+        depends on CPU_SUBTYPE_SH7780
+        select SYS_SUPPORTS_PCI
+        help
+          Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3
+          evaluation board.
+
 config SH_HIGHLANDER
         bool "Highlander"
         depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
@@ -399,41 +519,47 @@ config SH_MAGIC_PANEL_R2
         help
           Select Magic Panel R2 if configuring for Magic Panel R2.
 
+config SH_CAYMAN
+        bool "Hitachi Cayman"
+        depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
+        select SYS_SUPPORTS_PCI
+
 endmenu
 
-source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
 source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
 source "arch/sh/boards/renesas/r7780rp/Kconfig"
+source "arch/sh/boards/renesas/sdk7780/Kconfig"
 source "arch/sh/boards/magicpanelr2/Kconfig"
 
 menu "Timer and clock configuration"
 
 config SH_TMU
-        bool "TMU timer support"
+        def_bool y
+        prompt "TMU timer support"
         depends on CPU_SH3 || CPU_SH4
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
-        default y
         help
           This enables the use of the TMU as the system timer.
 
 config SH_CMT
-        bool "CMT timer support"
+        def_bool y
+        prompt "CMT timer support"
         depends on CPU_SH2
-        default y
         help
           This enables the use of the CMT as the system timer.
 
 config SH_MTU2
-        bool "MTU2 timer support"
+        def_bool n
+        prompt "MTU2 timer support"
         depends on CPU_SH2A
-        default n
         help
           This enables the use of the MTU2 as the system timer.
 
 config SH_TIMER_IRQ
         int
-        default "28" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
+        default "28" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || \
+                        CPU_SUBTYPE_SH7763
         default "86" if CPU_SUBTYPE_SH7619
         default "140" if CPU_SUBTYPE_SH7206
         default "16"
@@ -445,7 +571,8 @@ config SH_PCLK_FREQ
         default "32000000" if CPU_SUBTYPE_SH7722
         default "33333333" if CPU_SUBTYPE_SH7770 || \
                               CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \
-                              CPU_SUBTYPE_SH7206
+                              CPU_SUBTYPE_SH7203 || CPU_SUBTYPE_SH7206 || \
+                              CPU_SUBTYPE_SH7263
         default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R
         default "66000000" if CPU_SUBTYPE_SH4_202
         default "50000000"
@@ -456,7 +583,7 @@ config SH_PCLK_FREQ
 
 config SH_CLK_MD
         int "CPU Mode Pin Setting"
-        depends on CPU_SUBTYPE_SH7619 || CPU_SUBTYPE_SH7206
+        depends on CPU_SH2
         default 6 if CPU_SUBTYPE_SH7206
         default 5 if CPU_SUBTYPE_SH7619
         default 0
@@ -490,9 +617,8 @@ source "arch/sh/drivers/Kconfig"
 endmenu
 
 config ISA_DMA_API
-        bool
+        def_bool y
         depends on SH_MPC1211
-        default y
 
 menu "Kernel features"
 
@@ -570,7 +696,7 @@ source "kernel/Kconfig.preempt"
 
 config GUSA
         def_bool y
-        depends on !SMP
+        depends on !SMP && SUPERH32
         help
           This enables support for gUSA (general UserSpace Atomicity).
           This is the default implementation for both UP and non-ll/sc
@@ -582,6 +708,16 @@ config GUSA
           This should only be disabled for special cases where alternate
           atomicity implementations exist.
 
+config GUSA_RB
+        bool "Implement atomic operations by roll-back (gRB) (EXPERIMENTAL)"
+        depends on GUSA && CPU_SH3 || (CPU_SH4 && !CPU_SH4A)
+        help
+          Enabling this option will allow the kernel to implement some
+          atomic operations using a software implemention of load-locked/
+          store-conditional (LLSC). On machines which do not have hardware
+          LLSC, this should be more efficient than the other alternative of
+          disabling insterrupts around the atomic sequence.
+
 endmenu
 
 menu "Boot options"
diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu
new file mode 100644
index 000000000000..d850184d0694
--- /dev/null
+++ b/arch/sh/Kconfig.cpu
@@ -0,0 +1,115 @@
+menu "Processor features"
+
+choice
+        prompt "Endianess selection" 
+        default CPU_LITTLE_ENDIAN
+        help
+          Some SuperH machines can be configured for either little or big
+          endian byte order. These modes require different kernels.
+
+config CPU_LITTLE_ENDIAN
+        bool "Little Endian"
+
+config CPU_BIG_ENDIAN
+        bool "Big Endian"
+
+endchoice
+
+config SH_FPU
+        def_bool y
+        prompt "FPU support"
+        depends on CPU_HAS_FPU
+        help
+          Selecting this option will enable support for SH processors that
+          have FPU units (ie, SH77xx).
+
+          This option must be set in order to enable the FPU.
+
+config SH64_FPU_DENORM_FLUSH
+        bool "Flush floating point denorms to zero"
+        depends on SH_FPU && SUPERH64
+
+config SH_FPU_EMU
+        def_bool n
+        prompt "FPU emulation support"
+        depends on !SH_FPU && EXPERIMENTAL
+        help
+          Selecting this option will enable support for software FPU emulation.
+          Most SH-3 users will want to say Y here, whereas most SH-4 users will
+          want to say N.
+
+config SH_DSP
+        def_bool y
+        prompt "DSP support"
+        depends on CPU_HAS_DSP
+        help
+          Selecting this option will enable support for SH processors that
+          have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
+
+          This option must be set in order to enable the DSP.
+
+config SH_ADC
+        def_bool y
+        prompt "ADC support"
+        depends on CPU_SH3
+        help
+          Selecting this option will allow the Linux kernel to use SH3 on-chip
+          ADC module.
+
+          If unsure, say N.
+
+config SH_STORE_QUEUES
+        bool "Support for Store Queues"
+        depends on CPU_SH4
+        help
+          Selecting this option will enable an in-kernel API for manipulating
+          the store queues integrated in the SH-4 processors.
+
+config SPECULATIVE_EXECUTION
+        bool "Speculative subroutine return"
+        depends on CPU_SUBTYPE_SH7780 && EXPERIMENTAL
+        help
+          This enables support for a speculative instruction fetch for
+          subroutine return. There are various pitfalls associated with
+          this, as outlined in the SH7780 hardware manual.
+
+          If unsure, say N.
+
+config SH64_USER_MISALIGNED_FIXUP
+        def_bool y
+        prompt "Fixup misaligned loads/stores occurring in user mode"
+        depends on SUPERH64
+
+config SH64_ID2815_WORKAROUND
+        bool "Include workaround for SH5-101 cut2 silicon defect ID2815"
+        depends on CPU_SUBTYPE_SH5_101
+
+config CPU_HAS_INTEVT
+        bool
+
+config CPU_HAS_MASKREG_IRQ
+        bool
+
+config CPU_HAS_IPR_IRQ
+        bool
+
+config CPU_HAS_SR_RB
+        bool
+        help
+          This will enable the use of SR.RB register bank usage. Processors
+          that are lacking this bit must have another method in place for
+          accomplishing what is taken care of by the banked registers.
+
+          See <file:Documentation/sh/register-banks.txt> for further
+          information on SR.RB and register banking in the kernel in general.
+
+config CPU_HAS_PTEA
+        bool
+
+config CPU_HAS_DSP
+        bool
+
+config CPU_HAS_FPU
+        bool
+
+endmenu
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 722da6851f56..f7c716166ce8 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -1,8 +1,7 @@
 menu "Kernel hacking"
 
 config TRACE_IRQFLAGS_SUPPORT
-        bool
-        default y
+        def_bool y
 
 source "lib/Kconfig.debug"
 
@@ -30,12 +29,13 @@ config EARLY_SCIF_CONSOLE
 config EARLY_SCIF_CONSOLE_PORT
         hex
         depends on EARLY_SCIF_CONSOLE
-        default "0xffe00000" if CPU_SUBTYPE_SH7780
+        default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763
         default "0xffea0000" if CPU_SUBTYPE_SH7785
-        default "0xfffe9800" if CPU_SUBTYPE_SH7206
+        default "0xfffe8000" if CPU_SUBTYPE_SH7203
+        default "0xfffe9800" if CPU_SUBTYPE_SH7206 || CPU_SUBTYPE_SH7263
         default "0xf8420000" if CPU_SUBTYPE_SH7619
         default "0xa4400000" if CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7705
-        default "0xa4430000" if CPU_SUBTYPE_SH7720
+        default "0xa4430000" if CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721
         default "0xffc30000" if CPU_SUBTYPE_SHX3
         default "0xffe80000" if CPU_SH4
         default "0x00000000"
@@ -62,7 +62,7 @@ config DEBUG_BOOTMEM
 
 config DEBUG_STACKOVERFLOW
         bool "Check for stack overflows"
-        depends on DEBUG_KERNEL
+        depends on DEBUG_KERNEL && SUPERH32
         help
           This option will cause messages to be printed if free stack space
           drops below a certain limit.
@@ -88,7 +88,7 @@ config 4KSTACKS
 
 config IRQSTACKS
         bool "Use separate kernel stacks when processing interrupts"
-        depends on DEBUG_KERNEL
+        depends on DEBUG_KERNEL && SUPERH32
         help
           If you say Y here the kernel will use separate kernel stacks
           for handling hard and soft interrupts.  This can help avoid
@@ -119,19 +119,19 @@ config COMPILE_OPTIONS
         depends on MORE_COMPILE_OPTIONS
 
 config KGDB_NMI
-        bool "Enter KGDB on NMI"
-        default n
+        def_bool n
+        prompt "Enter KGDB on NMI"
 
 config SH_KGDB_CONSOLE
-        bool "Console messages through GDB"
+        def_bool n
+        prompt "Console messages through GDB"
         depends on !SERIAL_SH_SCI_CONSOLE && SERIAL_SH_SCI=y
         select SERIAL_CORE_CONSOLE
-        default n
 
 config KGDB_SYSRQ
-        bool "Allow SysRq 'G' to enter KGDB"
+        def_bool y
+        prompt "Allow SysRq 'G' to enter KGDB"
         depends on MAGIC_SYSRQ
-        default y
 
 comment "Serial port setup"
 
@@ -174,4 +174,29 @@ endchoice
 
 endmenu
 
+if SUPERH64
+
+config SH64_PROC_ASIDS
+        bool "Debug: report ASIDs through /proc/asids"
+        depends on PROC_FS
+
+config SH64_SR_WATCH
+        bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"
+
+config POOR_MANS_STRACE
+        bool "Debug: enable rudimentary strace facility"
+        help
+          This option allows system calls to be traced to the console.  It also
+          aids in detecting kernel stack underflow.  It is useful for debugging
+          early-userland problems (e.g. init incurring fatal exceptions.)
+
+config SH_ALPHANUMERIC
+        bool "Enable debug outputs to on-board alphanumeric display"
+        depends on SH_CAYMAN
+
+config SH_NO_BSS_INIT
+        bool "Avoid zeroing BSS (to speed-up startup on suitable platforms)"
+
+endif
+
 endmenu
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index e189fae8b60c..17fc36186bf4 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -1,17 +1,13 @@
-# $Id: Makefile,v 1.35 2004/04/15 03:39:20 sugioka Exp $
 #
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
+# arch/sh/Makefile
 #
 # Copyright (C) 1999  Kaz Kojima
 # Copyright (C) 2002, 2003, 2004  Paul Mundt
 # Copyright (C) 2002  M. R. Brown
 #
-# This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture
+# This file is subject to the terms and conditions of the GNU General Public
+# License.  See the file "COPYING" in the main directory of this archive
+# for more details.
 #
 isa-y                                   := any
 isa-$(CONFIG_SH_DSP)                    := sh
@@ -21,13 +17,9 @@ isa-$(CONFIG_CPU_SH3)			:= sh3
 isa-$(CONFIG_CPU_SH4)                   := sh4
 isa-$(CONFIG_CPU_SH4A)                  := sh4a
 isa-$(CONFIG_CPU_SH4AL_DSP)             := sh4al
-
+isa-$(CONFIG_CPU_SH5)                   := shmedia
 isa-$(CONFIG_SH_DSP)                    := $(isa-y)-dsp
 
-ifndef CONFIG_MMU
-isa-y                   := $(isa-y)-nommu
-endif
-
 ifndef CONFIG_SH_DSP
 ifndef CONFIG_SH_FPU
 isa-y                   := $(isa-y)-nofpu
@@ -44,6 +36,7 @@ cflags-$(CONFIG_CPU_SH4)		:= $(call cc-option,-m4,) \
         $(call cc-option,-mno-implicit-fp,-m4-nofpu)
 cflags-$(CONFIG_CPU_SH4A)               += $(call cc-option,-m4a,) \
                                            $(call cc-option,-m4a-nofpu,)
+cflags-$(CONFIG_CPU_SH5)                := $(call cc-option,-m5-32media-nofpu,)
 
 cflags-$(CONFIG_CPU_BIG_ENDIAN)         += -mb
 cflags-$(CONFIG_CPU_LITTLE_ENDIAN)      += -ml
@@ -66,22 +59,27 @@ cflags-y	+= $(isaflags-y) -ffreestanding
 cflags-$(CONFIG_MORE_COMPILE_OPTIONS)   += \
         $(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g')
 
-OBJCOPYFLAGS    := -O binary -R .note -R .note.gnu.build-id -R .comment -R .stab -R .stabstr -S
+OBJCOPYFLAGS    := -O binary -R .note -R .note.gnu.build-id -R .comment \
+                   -R .stab -R .stabstr -S
 
-#
-# arch/sh/defconfig doesn't reflect any real hardware, and as such should
-# never be used by anyone. Use a board-specific defconfig that has a
-# reasonable chance of being current instead.
-#
-KBUILD_DEFCONFIG := r7780rp_defconfig
+# Give the various platforms the opportunity to set default image types
+defaultimage-$(CONFIG_SUPERH32) := zImage
 
-KBUILD_IMAGE    := arch/sh/boot/zImage
+# Set some sensible Kbuild defaults
+KBUILD_DEFCONFIG        := r7780mp_defconfig
+KBUILD_IMAGE            := $(defaultimage-y)
 
 #
 # Choosing incompatible machines durings configuration will result in
 # error messages during linking.
 #
-LDFLAGS_vmlinux     += -e _stext
+ifdef CONFIG_SUPERH32
+LDFLAGS_vmlinux += -e _stext
+else
+LDFLAGS_vmlinux += --defsym phys_stext=_stext-$(CONFIG_PAGE_OFFSET) \
+                   --defsym phys_stext_shmedia=phys_stext+1 \
+                   -e phys_stext_shmedia
+endif
 
 ifdef CONFIG_CPU_LITTLE_ENDIAN
 LDFLAGS_vmlinux         += --defsym 'jiffies=jiffies_64'
@@ -94,7 +92,9 @@ endif
 KBUILD_CFLAGS           += -pipe $(cflags-y)
 KBUILD_AFLAGS           += $(cflags-y)
 
-head-y := arch/sh/kernel/head.o arch/sh/kernel/init_task.o
+head-y                  := arch/sh/kernel/init_task.o
+head-$(CONFIG_SUPERH32) += arch/sh/kernel/head_32.o
+head-$(CONFIG_SUPERH64) += arch/sh/kernel/head_64.o
 
 LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
@@ -112,11 +112,11 @@ machdir-$(CONFIG_SH_DREAMCAST)			+= dreamcast
 machdir-$(CONFIG_SH_MPC1211)                    += mpc1211
 machdir-$(CONFIG_SH_SH03)                       += sh03
 machdir-$(CONFIG_SH_SECUREEDGE5410)             += snapgear
-machdir-$(CONFIG_SH_HS7751RVOIP)                += renesas/hs7751rvoip
 machdir-$(CONFIG_SH_RTS7751R2D)                 += renesas/rts7751r2d
 machdir-$(CONFIG_SH_7751_SYSTEMH)               += renesas/systemh
 machdir-$(CONFIG_SH_EDOSK7705)                  += renesas/edosk7705
 machdir-$(CONFIG_SH_HIGHLANDER)                 += renesas/r7780rp
+machdir-$(CONFIG_SH_SDK7780)                    += renesas/sdk7780
 machdir-$(CONFIG_SH_7710VOIPGW)                 += renesas/sh7710voipgw
 machdir-$(CONFIG_SH_X3PROTO)                    += renesas/x3proto
 machdir-$(CONFIG_SH_SH4202_MICRODEV)            += superh/microdev
@@ -127,6 +127,7 @@ machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)	+= se/7206
 machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)       += se/7619
 machdir-$(CONFIG_SH_LBOX_RE2)                   += lboxre2
 machdir-$(CONFIG_SH_MAGIC_PANEL_R2)             += magicpanelr2
+machdir-$(CONFIG_SH_CAYMAN)                     += cayman
 
 incdir-y        := $(notdir $(machdir-y))
 
@@ -137,22 +138,22 @@ endif
 
 # Companion chips
 core-$(CONFIG_HD6446X_SERIES)   += arch/sh/cchips/hd6446x/
-core-$(CONFIG_MFD_SM501)        += arch/sh/cchips/voyagergx/
 
 cpuincdir-$(CONFIG_CPU_SH2)     := cpu-sh2
 cpuincdir-$(CONFIG_CPU_SH2A)    := cpu-sh2a
 cpuincdir-$(CONFIG_CPU_SH3)     := cpu-sh3
 cpuincdir-$(CONFIG_CPU_SH4)     := cpu-sh4
+cpuincdir-$(CONFIG_CPU_SH5)     := cpu-sh5
 
-libs-y                          := arch/sh/lib/ $(libs-y) $(LIBGCC)
+libs-$(CONFIG_SUPERH32)         := arch/sh/lib/ $(libs-y)
+libs-$(CONFIG_SUPERH64)         := arch/sh/lib64/ $(libs-y)
+libs-y                          += $(LIBGCC)
 
 drivers-y                       += arch/sh/drivers/
 drivers-$(CONFIG_OPROFILE)      += arch/sh/oprofile/
 
 boot := arch/sh/boot
 
-CPPFLAGS_vmlinux.lds := -traditional
-
 incdir-prefix   := $(srctree)/include/asm-sh/
 
 #       Update machine arch and proc symlinks if something which affects
@@ -196,29 +197,61 @@ include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \
         done
         @touch $@
 
-archprepare: include/asm-sh/.cpu include/asm-sh/.mach maketools
-
 PHONY += maketools FORCE
+
 maketools:  include/linux/version.h FORCE
         $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h
 
-all: zImage
+all: $(KBUILD_IMAGE)
 
 zImage uImage uImage.srec vmlinux.srec: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 compressed: zImage
 
+archprepare: include/asm-sh/.cpu include/asm-sh/.mach maketools \
+             arch/sh/lib64/syscalltab.h
+
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-CLEAN_FILES += include/asm-sh/machtypes.h \
-               include/asm-sh/cpu include/asm-sh/.cpu \
-               include/asm-sh/mach include/asm-sh/.mach
-
 define archhelp
         @echo '* zImage                    - Compressed kernel image'
         @echo '  vmlinux.srec              - Create an ELF S-record'
         @echo '  uImage                    - Create a bootable image for U-Boot'
         @echo '  uImage.srec               - Create an S-record for U-Boot'
 endef
+
+define filechk_gen-syscalltab
+       (set -e; \
+        echo "/*"; \
+        echo " * DO NOT MODIFY."; \
+        echo " *"; \
+        echo " * This file was generated by arch/sh/Makefile"; \
+        echo " * Any changes will be reverted at build time."; \
+        echo " */"; \
+        echo ""; \
+        echo "#ifndef __SYSCALLTAB_H"; \
+        echo "#define __SYSCALLTAB_H"; \
+        echo ""; \
+        echo "#include <linux/kernel.h>"; \
+        echo ""; \
+        echo "struct syscall_info {"; \
+        echo "  const char *name;"; \
+        echo "} syscall_info_table[] = {"; \
+        sed -e '/^.*\.long /!d;s//      { "/;s/\(\([^/]*\)\/\)\{1\}.*/\2/; \
+                s/[ \t]*$$//g;s/$$/" },/;s/\("\)sys_/\1/g'; \
+        echo "};"; \
+        echo ""; \
+        echo "#define NUM_SYSCALL_INFO_ENTRIES ARRAY_SIZE(syscall_info_table)";\
+        echo ""; \
+        echo "#endif /* __SYSCALLTAB_H */" )
+endef
+
+arch/sh/lib64/syscalltab.h: arch/sh/kernel/syscalls_64.S
+        $(call filechk,gen-syscalltab)
+
+CLEAN_FILES += arch/sh/lib64/syscalltab.h \
+               include/asm-sh/machtypes.h \
+               include/asm-sh/cpu include/asm-sh/.cpu \
+               include/asm-sh/mach include/asm-sh/.mach
diff --git a/arch/sh/boards/cayman/Makefile b/arch/sh/boards/cayman/Makefile
new file mode 100644
index 000000000000..489a8f867368
--- /dev/null
+++ b/arch/sh/boards/cayman/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Hitachi Cayman specific parts of the kernel
+#
+obj-y := setup.o irq.o
+obj-$(CONFIG_HEARTBEAT) += led.o
diff --git a/arch/sh64/mach-cayman/irq.c b/arch/sh/boards/cayman/irq.c
index aaad36d37d1f..30ec7bebfaf1 100644
--- a/arch/sh64/mach-cayman/irq.c
+++ b/arch/sh/boards/cayman/irq.c
@@ -1,24 +1,26 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/irq_cayman.c
- *
- * SH-5 Cayman Interrupt Support
+ * arch/sh/mach-cayman/irq.c - SH-5 Cayman Interrupt Support
  *
  * This file handles the board specific parts of the Cayman interrupt system
  *
  * Copyright (C) 2002 Stuart Menefy
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
-#include <asm/irq.h>
-#include <asm/page.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/signal.h>
-#include <asm/cayman.h>
+#include <asm/cpu/irq.h>
+#include <asm/page.h>
+
+/* Setup for the SMSC FDC37C935 / LAN91C100FD */
+#define SMSC_IRQ         IRQ_IRL1
+
+/* Setup for PCI Bus 2, which transmits interrupts via the EPLD */
+#define PCI2_IRQ         IRQ_IRL3
 
 unsigned long epld_virt;
 
diff --git a/arch/sh64/mach-cayman/led.c b/arch/sh/boards/cayman/led.c
index b4e122fd9502..a808eac4ecd6 100644
--- a/arch/sh64/mach-cayman/led.c
+++ b/arch/sh/boards/cayman/led.c
@@ -1,5 +1,5 @@
 /*
- * arch/sh64/mach-cayman/led.c
+ * arch/sh/boards/cayman/led.c
  *
  * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
  *
diff --git a/arch/sh64/mach-cayman/setup.c b/arch/sh/boards/cayman/setup.c
index 726c520d7eb9..8c9fa472d8f5 100644
--- a/arch/sh64/mach-cayman/setup.c
+++ b/arch/sh/boards/cayman/setup.c
@@ -1,28 +1,19 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/mach-cayman/setup.c
+ * arch/sh/mach-cayman/setup.c
  *
  * SH5 Cayman support
  *
- * This file handles the architecture-dependent parts of initialization
+ * Copyright (C) 2002  David J. Mckay & Benedict Gaster
+ * Copyright (C) 2003 - 2007  Paul Mundt
  *
- * Copyright David J. Mckay.
- * Needs major work!
- *
- * benedict.gaster@superh.com:   3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time.
- *
- * lethal@linux-sh.org:          15th May 2003
- *    Use the generic procfs cpuinfo interface, just return a valid board name.
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
-#include <asm/platform.h>
-#include <asm/irq.h>
-#include <asm/io.h>
+#include <asm/cpu/irq.h>
 
 /*
  * Platform Dependent Interrupt Priorities.
@@ -96,42 +87,6 @@
 
 unsigned long smsc_superio_virt;
 
-/*
- * Platform dependent structures: maps and parms block.
- */
-struct resource io_resources[] = {
-        /* To be updated with external devices */
-};
-
-struct resource kram_resources[] = {
-        /* These must be last in the array */
-        { .name = "Kernel code", .start = 0, .end = 0 },
-        /* These must be last in the array */
-        { .name = "Kernel data", .start = 0, .end = 0 }
-};
-
-struct resource xram_resources[] = {
-        /* To be updated with external devices */
-};
-
-struct resource rom_resources[] = {
-        /* To be updated with external devices */
-};
-
-struct sh64_platform platform_parms = {
-        .readonly_rootfs =      1,
-        .initial_root_dev =     0x0100,
-        .loader_type =          1,
-        .io_res_p =             io_resources,
-        .io_res_count =         ARRAY_SIZE(io_resources),
-        .kram_res_p =           kram_resources,
-        .kram_res_count =       ARRAY_SIZE(kram_resources),
-        .xram_res_p =           xram_resources,
-        .xram_res_count =       ARRAY_SIZE(xram_resources),
-        .rom_res_p =            rom_resources,
-        .rom_res_count =        ARRAY_SIZE(rom_resources),
-};
-
 int platform_int_priority[NR_INTC_IRQS] = {
         IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ  0- 7 */
         RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ  8-15 */
@@ -210,30 +165,23 @@ static int __init smsc_superio_setup(void)
 
         return 0;
 }
-
-/* This is grotty, but, because kernel is always referenced on the link line
- * before any devices, this is safe.
- */
 __initcall(smsc_superio_setup);
 
-void __init platform_setup(void)
-{
-        /* Cayman platform leaves the decision to head.S, for now */
-        platform_parms.fpu_flags = fpu_in_use;
-}
-
-void __init platform_monitor(void)
+static void __iomem *cayman_ioport_map(unsigned long port, unsigned int len)
 {
-        /* Nothing yet .. */
-}
+        if (port < 0x400) {
+                extern unsigned long smsc_superio_virt;
+                return (void __iomem *)((port << 2) | smsc_superio_virt);
+        }
 
-void __init platform_reserve(void)
-{
-        /* Nothing yet .. */
+        return (void __iomem *)port;
 }
 
-const char *get_system_type(void)
-{
-        return "Hitachi Cayman";
-}
+extern void init_cayman_irq(void);
 
+static struct sh_machine_vector mv_cayman __initmv = {
+        .mv_name                = "Hitachi Cayman",
+        .mv_nr_irqs             = 64,
+        .mv_ioport_map          = cayman_ioport_map,
+        .mv_init_irq            = init_cayman_irq,
+};
diff --git a/arch/sh/boards/dreamcast/irq.c b/arch/sh/boards/dreamcast/irq.c
index 5bf01f86c20c..9d0673a9092a 100644
--- a/arch/sh/boards/dreamcast/irq.c
+++ b/arch/sh/boards/dreamcast/irq.c
@@ -136,7 +136,7 @@ int systemasic_irq_demux(int irq)
         emr = EMR_BASE + (level << 4) + (level << 2);
         esr = ESR_BASE + (level << 2);
 
-        /* Mask the ESR to filter any spurious, unwanted interrtupts */
+        /* Mask the ESR to filter any spurious, unwanted interrupts */
         status = inl(esr);
         status &= inl(emr);
 
diff --git a/arch/sh/boards/dreamcast/setup.c b/arch/sh/boards/dreamcast/setup.c
index 8799df6e866a..2581c8cd5df7 100644
--- a/arch/sh/boards/dreamcast/setup.c
+++ b/arch/sh/boards/dreamcast/setup.c
@@ -33,9 +33,6 @@ extern void aica_time_init(void);
 extern int gapspci_init(void);
 extern int systemasic_irq_demux(int);
 
-void *dreamcast_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
-int dreamcast_consistent_free(struct device *, size_t, void *, dma_addr_t);
-
 static void __init dreamcast_setup(char **cmdline_p)
 {
         int i;
@@ -64,9 +61,4 @@ static struct sh_machine_vector mv_dreamcast __initmv = {
         .mv_name                = "Sega Dreamcast",
         .mv_setup               = dreamcast_setup,
         .mv_irq_demux           = systemasic_irq_demux,
-
-#ifdef CONFIG_PCI
-        .mv_consistent_alloc    = dreamcast_consistent_alloc,
-        .mv_consistent_free     = dreamcast_consistent_free,
-#endif
 };
diff --git a/arch/sh/boards/landisk/gio.c b/arch/sh/boards/landisk/gio.c
index a37643d002b2..17025080db35 100644
--- a/arch/sh/boards/landisk/gio.c
+++ b/arch/sh/boards/landisk/gio.c
@@ -121,7 +121,7 @@ static int gio_ioctl(struct inode *inode, struct file *filp,
         return 0;
 }
 
-static struct file_operations gio_fops = {
+static const struct file_operations gio_fops = {
         .owner = THIS_MODULE,
         .open = gio_open,       /* open */
         .release = gio_close,   /* release */
diff --git a/arch/sh/boards/renesas/hs7751rvoip/Kconfig b/arch/sh/boards/renesas/hs7751rvoip/Kconfig
deleted file mode 100644
index 1743be477be5..000000000000
--- a/arch/sh/boards/renesas/hs7751rvoip/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if SH_HS7751RVOIP
-
-menu "HS7751RVoIP options"
-
-config HS7751RVOIP_CODEC
-        bool "Support VoIP Codec section"
-        help
-          Selecting this option will support CODEC section.
-
-endmenu
-
-endif
diff --git a/arch/sh/boards/renesas/hs7751rvoip/Makefile b/arch/sh/boards/renesas/hs7751rvoip/Makefile
deleted file mode 100644
index e626377c55ee..000000000000
--- a/arch/sh/boards/renesas/hs7751rvoip/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for the HS7751RVoIP specific parts of the kernel
-#
-
-obj-y    := setup.o io.o irq.o
-
-obj-$(CONFIG_PCI) += pci.o
-
diff --git a/arch/sh/boards/renesas/hs7751rvoip/io.c b/arch/sh/boards/renesas/hs7751rvoip/io.c
deleted file mode 100644
index bb9aa0d62852..000000000000
--- a/arch/sh/boards/renesas/hs7751rvoip/io.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * linux/arch/sh/boards/renesas/hs7751rvoip/io.c
- *
- * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
- * Based largely on io_se.c.
- *
- * I/O routine for Renesas Technology sales HS7751RVoIP
- *
- * Initial version only to support LAN access; some
- * placeholder code from io_hs7751rvoip.c left in with the
- * expectation of later SuperIO and PCMCIA access.
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-#include <asm/hs7751rvoip.h>
-#include <asm/addrspace.h>
-
-extern void *area6_io8_base;    /* Area 6 8bit I/O Base address */
-extern void *area5_io16_base;   /* Area 5 16bit I/O Base address */
-
-/*
- * The 7751R HS7751RVoIP uses the built-in PCI controller (PCIC)
- * of the 7751R processor, and has a SuperIO accessible via the PCI.
- * The board also includes a PCMCIA controller on its memory bus,
- * like the other Solution Engine boards.
- */
-
-#define CODEC_IO_BASE   0x1000
-#define CODEC_IOMAP(a)  ((unsigned long)area6_io8_base + ((a) - CODEC_IO_BASE))
-
-static inline unsigned long port2adr(unsigned int port)
-{
-        if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-                if (port == 0x3f6)
-                        return ((unsigned long)area5_io16_base + 0x0c);
-                else
-                        return ((unsigned long)area5_io16_base + 0x800 +
-                                ((port-0x1f0) << 1));
-        else
-                maybebadio((unsigned long)port);
-        return port;
-}
-
-/* The 7751R HS7751RVoIP seems to have everything hooked */
-/* up pretty normally (nothing on high-bytes only...) so this */
-/* shouldn't be needed */
-static inline int shifted_port(unsigned long port)
-{
-        /* For IDE registers, value is not shifted */
-        if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-                return 0;
-        else
-                return 1;
-}
-
-#if defined(CONFIG_HS7751RVOIP_CODEC)
-#define codec_port(port)        \
-        ((CODEC_IO_BASE <= (port)) && ((port) < (CODEC_IO_BASE + 0x20)))
-#else
-#define codec_port(port)        (0)
-#endif
-
-/*
- * General outline: remap really low stuff [eventually] to SuperIO,
- * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
- * is mapped through the PCI IO window.  Stuff with high bits (PXSEG)
- * should be way beyond the window, and is used  w/o translation for
- * compatibility.
- */
-unsigned char hs7751rvoip_inb(unsigned long port)
-{
-        if (PXSEG(port))
-                return ctrl_inb(port);
-        else if (codec_port(port))
-                return ctrl_inb(CODEC_IOMAP(port));
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                return ctrl_inb(pci_ioaddr(port));
-        else
-                return ctrl_inw(port2adr(port)) & 0xff;
-}
-
-unsigned char hs7751rvoip_inb_p(unsigned long port)
-{
-        unsigned char v;
-
-        if (PXSEG(port))
-                v = ctrl_inb(port);
-        else if (codec_port(port))
-                v = ctrl_inb(CODEC_IOMAP(port));
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                v = ctrl_inb(pci_ioaddr(port));
-        else
-                v = ctrl_inw(port2adr(port)) & 0xff;
-        ctrl_delay();
-        return v;
-}
-
-unsigned short hs7751rvoip_inw(unsigned long port)
-{
-        if (PXSEG(port))
-                return ctrl_inw(port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                return ctrl_inw(pci_ioaddr(port));
-        else
-                maybebadio(port);
-        return 0;
-}
-
-unsigned int hs7751rvoip_inl(unsigned long port)
-{
-        if (PXSEG(port))
-                return ctrl_inl(port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                return ctrl_inl(pci_ioaddr(port));
-        else
-                maybebadio(port);
-        return 0;
-}
-
-void hs7751rvoip_outb(unsigned char value, unsigned long port)
-{
-
-        if (PXSEG(port))
-                ctrl_outb(value, port);
-        else if (codec_port(port))
-                ctrl_outb(value, CODEC_IOMAP(port));
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                ctrl_outb(value, pci_ioaddr(port));
-        else
-                ctrl_outb(value, port2adr(port));
-}
-
-void hs7751rvoip_outb_p(unsigned char value, unsigned long port)
-{
-        if (PXSEG(port))
-                ctrl_outb(value, port);
-        else if (codec_port(port))
-                ctrl_outb(value, CODEC_IOMAP(port));
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                ctrl_outb(value, pci_ioaddr(port));
-        else
-                ctrl_outw(value, port2adr(port));
-
-        ctrl_delay();
-}
-
-void hs7751rvoip_outw(unsigned short value, unsigned long port)
-{
-        if (PXSEG(port))
-                ctrl_outw(value, port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                ctrl_outw(value, pci_ioaddr(port));
-        else
-                maybebadio(port);
-}
-
-void hs7751rvoip_outl(unsigned int value, unsigned long port)
-{
-        if (PXSEG(port))
-                ctrl_outl(value, port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                ctrl_outl(value, pci_ioaddr(port));
-        else
-                maybebadio(port);
-}
-
-void hs7751rvoip_insb(unsigned long port, void *addr, unsigned long count)
-{
-        u8 *buf = addr;
-
-        if (PXSEG(port))
-                while (count--)
-                        *buf++ = ctrl_inb(port);
-        else if (codec_port(port))
-                while (count--)
-                        *buf++ = ctrl_inb(CODEC_IOMAP(port));
-        else if (is_pci_ioaddr(port) || shifted_port(port)) {
-                volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
-
-                while (count--)
-                        *buf++ = *bp;
-        } else {
-                volatile u16 *p = (volatile u16 *)port2adr(port);
-
-                while (count--)
-                        *buf++ = *p & 0xff;
-        }
-}
-
-void hs7751rvoip_insw(unsigned long port, void *addr, unsigned long count)
-{
-        volatile u16 *p;
-        u16 *buf = addr;
-
-        if (PXSEG(port))
-                p = (volatile u16 *)port;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                p = (volatile u16 *)pci_ioaddr(port);
-        else
-                p = (volatile u16 *)port2adr(port);
-        while (count--)
-                *buf++ = *p;
-}
-
-void hs7751rvoip_insl(unsigned long port, void *addr, unsigned long count)
-{
-
-        if (is_pci_ioaddr(port) || shifted_port(port)) {
-                volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
-                u32 *buf = addr;
-
-                while (count--)
-                        *buf++ = *p;
-        } else
-                maybebadio(port);
-}
-
-void hs7751rvoip_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-        const u8 *buf = addr;
-
-        if (PXSEG(port))
-                while (count--)
-                        ctrl_outb(*buf++, port);
-        else if (codec_port(port))
-                while (count--)
-                        ctrl_outb(*buf++, CODEC_IOMAP(port));
-        else if (is_pci_ioaddr(port) || shifted_port(port)) {
-                volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
-
-                while (count--)
-                        *bp = *buf++;
-        } else {
-                volatile u16 *p = (volatile u16 *)port2adr(port);
-
-                while (count--)
-                        *p = *buf++;
-        }
-}
-
-void hs7751rvoip_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-        volatile u16 *p;
-        const u16 *buf = addr;
-
-        if (PXSEG(port))
-                p = (volatile u16 *)port;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                p = (volatile u16 *)pci_ioaddr(port);
-        else
-                p = (volatile u16 *)port2adr(port);
-
-        while (count--)
-                *p = *buf++;
-}
-
-void hs7751rvoip_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-        const u32 *buf = addr;
-
-        if (is_pci_ioaddr(port) || shifted_port(port)) {
-                volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
-
-                while (count--)
-                        *p = *buf++;
-        } else
-                maybebadio(port);
-}
-
-void __iomem *hs7751rvoip_ioport_map(unsigned long port, unsigned int size)
-{
-        if (PXSEG(port))
-                return (void __iomem *)port;
-        else if (unlikely(codec_port(port) && (size == 1)))
-                return (void __iomem *)CODEC_IOMAP(port);
-        else if (is_pci_ioaddr(port))
-                return (void __iomem *)pci_ioaddr(port);
-
-        return (void __iomem *)port2adr(port);
-}
diff --git a/arch/sh/boards/renesas/hs7751rvoip/irq.c b/arch/sh/boards/renesas/hs7751rvoip/irq.c
deleted file mode 100644
index e55c6686b21f..000000000000
--- a/arch/sh/boards/renesas/hs7751rvoip/irq.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * linux/arch/sh/boards/renesas/hs7751rvoip/irq.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * Renesas Technology Sales HS7751RVoIP Support.
- *
- * Modified for HS7751RVoIP by
- * Atom Create Engineering Co., Ltd. 2002.
- * Lineo uSolutions, Inc. 2003.
- */
-
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/hs7751rvoip.h>
-
-static int mask_pos[] = {8, 9, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7};
-
-static void enable_hs7751rvoip_irq(unsigned int irq);
-static void disable_hs7751rvoip_irq(unsigned int irq);
-
-/* shutdown is same as "disable" */
-#define shutdown_hs7751rvoip_irq disable_hs7751rvoip_irq
-
-static void ack_hs7751rvoip_irq(unsigned int irq);
-static void end_hs7751rvoip_irq(unsigned int irq);
-
-static unsigned int startup_hs7751rvoip_irq(unsigned int irq)
-{
-        enable_hs7751rvoip_irq(irq);
-        return 0; /* never anything pending */
-}
-
-static void disable_hs7751rvoip_irq(unsigned int irq)
-{
-        unsigned short val;
-        unsigned short mask = 0xffff ^ (0x0001 << mask_pos[irq]);
-
-        /* Set the priority in IPR to 0 */
-        val = ctrl_inw(IRLCNTR3);
-        val &= mask;
-        ctrl_outw(val, IRLCNTR3);
-}
-
-static void enable_hs7751rvoip_irq(unsigned int irq)
-{
-        unsigned short val;
-        unsigned short value = (0x0001 << mask_pos[irq]);
-
-        /* Set priority in IPR back to original value */
-        val = ctrl_inw(IRLCNTR3);
-        val |= value;
-        ctrl_outw(val, IRLCNTR3);
-}
-
-static void ack_hs7751rvoip_irq(unsigned int irq)
-{
-        disable_hs7751rvoip_irq(irq);
-}
-
-static void end_hs7751rvoip_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                enable_hs7751rvoip_irq(irq);
-}
-
-static struct hw_interrupt_type hs7751rvoip_irq_type = {
-        .typename =  "HS7751RVoIP IRQ",
-        .startup = startup_hs7751rvoip_irq,
-        .shutdown = shutdown_hs7751rvoip_irq,
-        .enable = enable_hs7751rvoip_irq,
-        .disable = disable_hs7751rvoip_irq,
-        .ack = ack_hs7751rvoip_irq,
-        .end = end_hs7751rvoip_irq,
-};
-
-static void make_hs7751rvoip_irq(unsigned int irq)
-{
-        disable_irq_nosync(irq);
-        irq_desc[irq].chip = &hs7751rvoip_irq_type;
-        disable_hs7751rvoip_irq(irq);
-}
-
-/*
- * Initialize IRQ setting
- */
-void __init init_hs7751rvoip_IRQ(void)
-{
-        int i;
-
-        /* IRL0=ON HOOK1
-         * IRL1=OFF HOOK1
-         * IRL2=ON HOOK2
-         * IRL3=OFF HOOK2
-         * IRL4=Ringing Detection
-         * IRL5=CODEC
-         * IRL6=Ethernet
-         * IRL7=Ethernet Hub
-         * IRL8=USB Communication
-         * IRL9=USB Connection
-         * IRL10=USB DMA
-         * IRL11=CF Card
-         * IRL12=PCMCIA
-         * IRL13=PCI Slot
-         */
-        ctrl_outw(0x9876, IRLCNTR1);
-        ctrl_outw(0xdcba, IRLCNTR2);
-        ctrl_outw(0x0050, IRLCNTR4);
-        ctrl_outw(0x4321, IRLCNTR5);
-
-        for (i=0; i<14; i++)
-                make_hs7751rvoip_irq(i);
-}
diff --git a/arch/sh/boards/renesas/hs7751rvoip/pci.c b/arch/sh/boards/renesas/hs7751rvoip/pci.c
deleted file mode 100644
index 1c0ddee30d21..000000000000
--- a/arch/sh/boards/renesas/hs7751rvoip/pci.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * linux/arch/sh/boards/renesas/hs7751rvoip/pci.c
- *
- * Author:  Ian DaSilva (idasilva@mvista.com)
- *
- * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * PCI initialization for the Renesas SH7751R HS7751RVoIP board
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/module.h>
-
-#include <asm/io.h>
-#include "../../../drivers/pci/pci-sh7751.h"
-#include <asm/hs7751rvoip/hs7751rvoip.h>
-
-#define PCIMCR_MRSET_OFF        0xBFFFFFFF
-#define PCIMCR_RFSH_OFF         0xFFFFFFFB
-
-/*
- * Only long word accesses of the PCIC's internal local registers and the
- * configuration registers from the CPU is supported.
- */
-#define PCIC_WRITE(x,v) writel((v), PCI_REG(x))
-#define PCIC_READ(x) readl(PCI_REG(x))
-
-/*
- * Description:  This function sets up and initializes the pcic, sets
- * up the BARS, maps the DRAM into the address space etc, etc.
- */
-int __init pcibios_init_platform(void)
-{
-        unsigned long bcr1, wcr1, wcr2, wcr3, mcr;
-        unsigned short bcr2, bcr3;
-
-        /*
-         * Initialize the slave bus controller on the pcic.  The values used
-         * here should not be hardcoded, but they should be taken from the bsc
-         * on the processor, to make this function as generic as possible.
-         * (i.e. Another sbc may usr different SDRAM timing settings -- in order
-         * for the pcic to work, its settings need to be exactly the same.)
-         */
-        bcr1 = (*(volatile unsigned long *)(SH7751_BCR1));
-        bcr2 = (*(volatile unsigned short *)(SH7751_BCR2));
-        bcr3 = (*(volatile unsigned short *)(SH7751_BCR3));
-        wcr1 = (*(volatile unsigned long *)(SH7751_WCR1));
-        wcr2 = (*(volatile unsigned long *)(SH7751_WCR2));
-        wcr3 = (*(volatile unsigned long *)(SH7751_WCR3));
-        mcr = (*(volatile unsigned long *)(SH7751_MCR));
-
-        bcr1 = bcr1 | 0x00080000;  /* Enable Bit 19, BREQEN */
-        (*(volatile unsigned long *)(SH7751_BCR1)) = bcr1;
-
-        bcr1 = bcr1 | 0x40080000;  /* Enable Bit 19 BREQEN, set PCIC to slave */
-        PCIC_WRITE(SH7751_PCIBCR1, bcr1);       /* PCIC BCR1 */
-        PCIC_WRITE(SH7751_PCIBCR2, bcr2);       /* PCIC BCR2 */
-        PCIC_WRITE(SH7751_PCIBCR3, bcr3);       /* PCIC BCR3 */
-        PCIC_WRITE(SH7751_PCIWCR1, wcr1);       /* PCIC WCR1 */
-        PCIC_WRITE(SH7751_PCIWCR2, wcr2);       /* PCIC WCR2 */
-        PCIC_WRITE(SH7751_PCIWCR3, wcr3);       /* PCIC WCR3 */
-        mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF;
-        PCIC_WRITE(SH7751_PCIMCR, mcr);         /* PCIC MCR */
-
-        /* Enable all interrupts, so we know what to fix */
-        PCIC_WRITE(SH7751_PCIINTM, 0x0000c3ff);
-        PCIC_WRITE(SH7751_PCIAINTM, 0x0000380f);
-
-        /* Set up standard PCI config registers */
-        PCIC_WRITE(SH7751_PCICONF1, 0xFB900047); /* Bus Master, Mem & I/O access */
-        PCIC_WRITE(SH7751_PCICONF2, 0x00000000); /* PCI Class code & Revision ID */
-        PCIC_WRITE(SH7751_PCICONF4, 0xab000001); /* PCI I/O address (local regs) */
-        PCIC_WRITE(SH7751_PCICONF5, 0x0c000000); /* PCI MEM address (local RAM)  */
-        PCIC_WRITE(SH7751_PCICONF6, 0xd0000000); /* PCI MEM address (unused) */
-        PCIC_WRITE(SH7751_PCICONF11, 0x35051054); /* PCI Subsystem ID & Vendor ID */
-        PCIC_WRITE(SH7751_PCILSR0, 0x03f00000); /* MEM (full 64M exposed) */
-        PCIC_WRITE(SH7751_PCILSR1, 0x00000000); /* MEM (unused) */
-        PCIC_WRITE(SH7751_PCILAR0, 0x0c000000); /* MEM (direct map from PCI) */
-        PCIC_WRITE(SH7751_PCILAR1, 0x00000000); /* MEM (unused) */
-
-        /* Now turn it on... */
-        PCIC_WRITE(SH7751_PCICR, 0xa5000001);
-
-        /*
-         * Set PCIMBR and PCIIOBR here, assuming a single window
-         * (16M MEM, 256K IO) is enough.  If a larger space is
-         * needed, the readx/writex and inx/outx functions will
-         * have to do more (e.g. setting registers for each call).
-         */
-
-        /*
-         * Set the MBR so PCI address is one-to-one with window,
-         * meaning all calls go straight through... use ifdef to
-         * catch erroneous assumption.
-         */
-        BUG_ON(PCIBIOS_MIN_MEM != SH7751_PCI_MEMORY_BASE);
-
-        PCIC_WRITE(SH7751_PCIMBR, PCIBIOS_MIN_MEM);
-
-        /* Set IOBR for window containing area specified in pci.h */
-        PCIC_WRITE(SH7751_PCIIOBR, (PCIBIOS_MIN_IO & SH7751_PCIIOBR_MASK));
-
-        /* All done, may as well say so... */
-        printk("SH7751R PCI: Finished initialization of the PCI controller\n");
-
-        return 1;
-}
-
-int __init pcibios_map_platform_irq(u8 slot, u8 pin)
-{
-        switch (slot) {
-        case 0: return IRQ_PCISLOT;     /* PCI Extend slot */
-        case 1: return IRQ_PCMCIA;      /* PCI Cardbus Bridge */
-        case 2: return IRQ_PCIETH;      /* Realtek Ethernet controller */
-        case 3: return IRQ_PCIHUB;      /* Realtek Ethernet Hub controller */
-        default:
-                printk("PCI: Bad IRQ mapping request for slot %d\n", slot);
-                return -1;
-        }
-}
-
-static struct resource sh7751_io_resource = {
-        .name   = "SH7751_IO",
-        .start  = 0x4000,
-        .end    = 0x4000 + SH7751_PCI_IO_SIZE - 1,
-        .flags  = IORESOURCE_IO
-};
-
-static struct resource sh7751_mem_resource = {
-        .name   = "SH7751_mem",
-        .start  = SH7751_PCI_MEMORY_BASE,
-        .end    = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
-        .flags  = IORESOURCE_MEM
-};
-
-extern struct pci_ops sh7751_pci_ops;
-
-struct pci_channel board_pci_channels[] = {
-        { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
-        { NULL, NULL, NULL, 0, 0 },
-};
-EXPORT_SYMBOL(board_pci_channels);
diff --git a/arch/sh/boards/renesas/hs7751rvoip/setup.c b/arch/sh/boards/renesas/hs7751rvoip/setup.c
deleted file mode 100644
index c05625975f2c..000000000000
--- a/arch/sh/boards/renesas/hs7751rvoip/setup.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Renesas Technology Sales HS7751RVoIP Support.
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * Modified for HS7751RVoIP by
- * Atom Create Engineering Co., Ltd. 2002.
- * Lineo uSolutions, Inc. 2003.
- */
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/mm.h>
-#include <linux/pm.h>
-#include <asm/hs7751rvoip.h>
-#include <asm/io.h>
-#include <asm/machvec.h>
-
-static void hs7751rvoip_power_off(void)
-{
-        ctrl_outw(ctrl_inw(PA_OUTPORTR) & 0xffdf, PA_OUTPORTR);
-}
-
-void *area5_io8_base;
-void *area6_io8_base;
-void *area5_io16_base;
-void *area6_io16_base;
-
-static int __init hs7751rvoip_cf_init(void)
-{
-        pgprot_t prot;
-        unsigned long paddrbase;
-
-        /* open I/O area window */
-        paddrbase = virt_to_phys((void *)(PA_AREA5_IO+0x00000800));
-        prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_COM16);
-        area5_io16_base = p3_ioremap(paddrbase, PAGE_SIZE, prot.pgprot);
-        if (!area5_io16_base) {
-                printk("allocate_cf_area : can't open CF I/O window!\n");
-                return -ENOMEM;
-        }
-
-        /* XXX : do we need attribute and common-memory area also? */
-
-        paddrbase = virt_to_phys((void *)PA_AREA6_IO);
-#if defined(CONFIG_HS7751RVOIP_CODEC)
-        prot = PAGE_KERNEL_PCC(0, _PAGE_PCC_COM8);
-#else
-        prot = PAGE_KERNEL_PCC(0, _PAGE_PCC_IO8);
-#endif
-        area6_io8_base = p3_ioremap(paddrbase, PAGE_SIZE, prot.pgprot);
-        if (!area6_io8_base) {
-                printk("allocate_cf_area : can't open CODEC I/O 8bit window!\n");
-                return -ENOMEM;
-        }
-        prot = PAGE_KERNEL_PCC(0, _PAGE_PCC_IO16);
-        area6_io16_base = p3_ioremap(paddrbase, PAGE_SIZE, prot.pgprot);
-        if (!area6_io16_base) {
-                printk("allocate_cf_area : can't open CODEC I/O 16bit window!\n");
-                return -ENOMEM;
-        }
-
-        return 0;
-}
-device_initcall(hs7751rvoip_cf_init);
-
-/*
- * Initialize the board
- */
-static void __init hs7751rvoip_setup(char **cmdline_p)
-{
-        ctrl_outb(0xf0, PA_OUTPORTR);
-        pm_power_off = hs7751rvoip_power_off;
-
-        printk(KERN_INFO "Renesas Technology Sales HS7751RVoIP-2 support.\n");
-}
-
-static struct sh_machine_vector mv_hs7751rvoip __initmv = {
-        .mv_name                = "HS7751RVoIP",
-        .mv_setup               = hs7751rvoip_setup,
-        .mv_nr_irqs             = 72,
-
-        .mv_inb                 = hs7751rvoip_inb,
-        .mv_inw                 = hs7751rvoip_inw,
-        .mv_inl                 = hs7751rvoip_inl,
-        .mv_outb                = hs7751rvoip_outb,
-        .mv_outw                = hs7751rvoip_outw,
-        .mv_outl                = hs7751rvoip_outl,
-
-        .mv_inb_p               = hs7751rvoip_inb_p,
-        .mv_inw_p               = hs7751rvoip_inw,
-        .mv_inl_p               = hs7751rvoip_inl,
-        .mv_outb_p              = hs7751rvoip_outb_p,
-        .mv_outw_p              = hs7751rvoip_outw,
-        .mv_outl_p              = hs7751rvoip_outl,
-
-        .mv_insb                = hs7751rvoip_insb,
-        .mv_insw                = hs7751rvoip_insw,
-        .mv_insl                = hs7751rvoip_insl,
-        .mv_outsb               = hs7751rvoip_outsb,
-        .mv_outsw               = hs7751rvoip_outsw,
-        .mv_outsl               = hs7751rvoip_outsl,
-
-        .mv_init_irq            = init_hs7751rvoip_IRQ,
-        .mv_ioport_map          = hs7751rvoip_ioport_map,
-};
diff --git a/arch/sh/boards/renesas/r7780rp/Makefile b/arch/sh/boards/renesas/r7780rp/Makefile
index dd26182fbf58..20a10080b11f 100644
--- a/arch/sh/boards/renesas/r7780rp/Makefile
+++ b/arch/sh/boards/renesas/r7780rp/Makefile
@@ -3,7 +3,7 @@
 #
 irqinit-$(CONFIG_SH_R7780MP)    := irq-r7780mp.o
 irqinit-$(CONFIG_SH_R7785RP)    := irq-r7785rp.o
-irqinit-$(CONFIG_SH_R7780RP)    := irq-r7780rp.o irq.o
+irqinit-$(CONFIG_SH_R7780RP)    := irq-r7780rp.o
 obj-y                           := setup.o $(irqinit-y)
 
 ifneq ($(CONFIG_SH_R7785RP),y)
diff --git a/arch/sh/boards/renesas/r7780rp/irq-r7780mp.c b/arch/sh/boards/renesas/r7780rp/irq-r7780mp.c
index 59b47fe061f9..1f8f073f27be 100644
--- a/arch/sh/boards/renesas/r7780rp/irq-r7780mp.c
+++ b/arch/sh/boards/renesas/r7780rp/irq-r7780mp.c
@@ -47,7 +47,7 @@ static unsigned char irl2irq[HL_NR_IRL] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc, "r7780mp", vectors,
-                         NULL, NULL, mask_registers, NULL, NULL);
+                         NULL, mask_registers, NULL, NULL);
 
 unsigned char * __init highlander_init_irq_r7780mp(void)
 {
diff --git a/arch/sh/boards/renesas/r7780rp/irq-r7780rp.c b/arch/sh/boards/renesas/r7780rp/irq-r7780rp.c
index fa4a534cade9..bd34048ed0e1 100644
--- a/arch/sh/boards/renesas/r7780rp/irq-r7780rp.c
+++ b/arch/sh/boards/renesas/r7780rp/irq-r7780rp.c
@@ -3,21 +3,65 @@
  *
  * Copyright (C) 2002  Atom Create Engineering Co., Ltd.
  * Copyright (C) 2006  Paul Mundt
+ * Copyright (C) 2008  Magnus Damm
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/io.h>
 #include <asm/r7780rp.h>
 
+enum {
+        UNUSED = 0,
+
+        /* board specific interrupt sources */
+
+        AX88796,          /* Ethernet controller */
+        PSW,              /* Push Switch */
+        CF,               /* Compact Flash */
+
+        PCI_A,
+        PCI_B,
+        PCI_C,
+        PCI_D,
+};
+
+static struct intc_vect vectors[] __initdata = {
+        INTC_IRQ(PCI_A, 65), /* dirty: overwrite cpu vectors for pci */
+        INTC_IRQ(PCI_B, 66),
+        INTC_IRQ(PCI_C, 67),
+        INTC_IRQ(PCI_D, 68),
+        INTC_IRQ(CF, IRQ_CF),
+        INTC_IRQ(PSW, IRQ_PSW),
+        INTC_IRQ(AX88796, IRQ_AX88796),
+};
+
+static struct intc_mask_reg mask_registers[] __initdata = {
+        { 0xa5000000, 0, 16, /* IRLMSK */
+          { PCI_A, PCI_B, PCI_C, PCI_D, CF, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, PSW, AX88796 } },
+};
+
+static unsigned char irl2irq[HL_NR_IRL] __initdata = {
+        65, 66, 67, 68,
+        IRQ_CF, 0, 0, 0,
+        0, 0, 0, 0,
+        IRQ_AX88796, IRQ_PSW
+};
+
+static DECLARE_INTC_DESC(intc_desc, "r7780rp", vectors,
+                         NULL, mask_registers, NULL, NULL);
+
 unsigned char * __init highlander_init_irq_r7780rp(void)
 {
-        int i;
-
-        for (i = 0; i < 15; i++)
-                make_r7780rp_irq(i);
+        if (ctrl_inw(0xa5000600)) {
+                printk(KERN_INFO "Using r7780rp interrupt controller.\n");
+                register_intc_controller(&intc_desc);
+                return irl2irq;
+        }
 
         return NULL;
 }
diff --git a/arch/sh/boards/renesas/r7780rp/irq-r7785rp.c b/arch/sh/boards/renesas/r7780rp/irq-r7785rp.c
index b2c6a84673bd..bf7ec107fbc6 100644
--- a/arch/sh/boards/renesas/r7780rp/irq-r7785rp.c
+++ b/arch/sh/boards/renesas/r7780rp/irq-r7785rp.c
@@ -2,7 +2,7 @@
  * Renesas Solutions Highlander R7785RP Support.
  *
  * Copyright (C) 2002  Atom Create Engineering Co., Ltd.
- * Copyright (C) 2006  Paul Mundt
+ * Copyright (C) 2006 - 2008  Paul Mundt
  * Copyright (C) 2007  Magnus Damm
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -17,31 +17,52 @@
 enum {
         UNUSED = 0,
 
-        /* board specific interrupt sources */
-        AX88796,          /* Ethernet controller */
-        CF,               /* Compact Flash */
+        /* FPGA specific interrupt sources */
+        CF,             /* Compact Flash */
+        SMBUS,          /* SMBUS */
+        TP,             /* Touch panel */
+        RTC,            /* RTC Alarm */
+        TH_ALERT,       /* Temperature sensor */
+        AX88796,        /* Ethernet controller */
+
+        /* external bus connector */
+        EXT0, EXT1, EXT2, EXT3, EXT4, EXT5, EXT6, EXT7,
 };
 
 static struct intc_vect vectors[] __initdata = {
         INTC_IRQ(CF, IRQ_CF),
+        INTC_IRQ(SMBUS, IRQ_SMBUS),
+        INTC_IRQ(TP, IRQ_TP),
+        INTC_IRQ(RTC, IRQ_RTC),
+        INTC_IRQ(TH_ALERT, IRQ_TH_ALERT),
+
+        INTC_IRQ(EXT0, IRQ_EXT0), INTC_IRQ(EXT1, IRQ_EXT1),
+        INTC_IRQ(EXT2, IRQ_EXT2), INTC_IRQ(EXT3, IRQ_EXT3),
+
+        INTC_IRQ(EXT4, IRQ_EXT4), INTC_IRQ(EXT5, IRQ_EXT5),
+        INTC_IRQ(EXT6, IRQ_EXT6), INTC_IRQ(EXT7, IRQ_EXT7),
+
         INTC_IRQ(AX88796, IRQ_AX88796),
 };
 
 static struct intc_mask_reg mask_registers[] __initdata = {
         { 0xa4000010, 0, 16, /* IRLMCR1 */
-          { 0, 0, 0, 0, CF, AX88796, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0 } },
+          { 0, 0, 0, 0, CF, AX88796, SMBUS, TP,
+            RTC, 0, TH_ALERT, 0, 0, 0, 0, 0 } },
+        { 0xa4000012, 0, 16, /* IRLMCR2 */
+          { 0, 0, 0, 0, 0, 0, 0, 0,
+            EXT7, EXT6, EXT5, EXT4, EXT3, EXT2, EXT1, EXT0 } },
 };
 
 static unsigned char irl2irq[HL_NR_IRL] __initdata = {
-        0, IRQ_CF, 0, 0,
-        0, 0, 0, 0,
-        0, 0, IRQ_AX88796, 0,
-        0, 0, 0,
+        0, IRQ_CF, IRQ_EXT4, IRQ_EXT5,
+        IRQ_EXT6, IRQ_EXT7, IRQ_SMBUS, IRQ_TP,
+        IRQ_RTC, IRQ_TH_ALERT, IRQ_AX88796, IRQ_EXT0,
+        IRQ_EXT1, IRQ_EXT2, IRQ_EXT3,
 };
 
 static DECLARE_INTC_DESC(intc_desc, "r7785rp", vectors,
-                         NULL, NULL, mask_registers, NULL, NULL);
+                         NULL, mask_registers, NULL, NULL);
 
 unsigned char * __init highlander_init_irq_r7785rp(void)
 {
@@ -58,7 +79,7 @@ unsigned char * __init highlander_init_irq_r7785rp(void)
         ctrl_outw(0x7060, PA_IRLPRC);   /* FPGA IRLC */
         ctrl_outw(0x0000, PA_IRLPRD);   /* FPGA IRLD */
         ctrl_outw(0x4321, PA_IRLPRE);   /* FPGA IRLE */
-        ctrl_outw(0x0000, PA_IRLPRF);   /* FPGA IRLF */
+        ctrl_outw(0xdcba, PA_IRLPRF);   /* FPGA IRLF */
 
         register_intc_controller(&intc_desc);
         return irl2irq;
diff --git a/arch/sh/boards/renesas/r7780rp/irq.c b/arch/sh/boards/renesas/r7780rp/irq.c
deleted file mode 100644
index e0b8eb52f376..000000000000
--- a/arch/sh/boards/renesas/r7780rp/irq.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Renesas Solutions Highlander R7780RP-1 Support.
- *
- * Copyright (C) 2002  Atom Create Engineering Co., Ltd.
- * Copyright (C) 2006  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
-#include <asm/r7780rp.h>
-
-#ifdef CONFIG_SH_R7780RP
-static int mask_pos[] = {15, 14, 13, 12, 11, 10, 9, 8, 7, 5, 6, 4, 0, 1, 2, 0};
-#elif defined(CONFIG_SH_R7780MP)
-static int mask_pos[] = {12, 11, 9, 14, 15, 8, 13, 6, 5, 4, 3, 2, 0, 0, 1, 0};
-#elif defined(CONFIG_SH_R7785RP)
-static int mask_pos[] = {2, 11, 2, 2, 2, 2, 9, 8, 7, 5, 10, 2, 2, 2, 2, 2};
-#endif
-
-static void enable_r7780rp_irq(unsigned int irq)
-{
-        /* Set priority in IPR back to original value */
-        ctrl_outw(ctrl_inw(IRLCNTR1) | (1 << mask_pos[irq]), IRLCNTR1);
-}
-
-static void disable_r7780rp_irq(unsigned int irq)
-{
-        /* Set the priority in IPR to 0 */
-        ctrl_outw(ctrl_inw(IRLCNTR1) & (0xffff ^ (1 << mask_pos[irq])),
-                  IRLCNTR1);
-}
-
-static struct irq_chip r7780rp_irq_chip __read_mostly = {
-        .name           = "R7780RP",
-        .mask           = disable_r7780rp_irq,
-        .unmask         = enable_r7780rp_irq,
-        .mask_ack       = disable_r7780rp_irq,
-};
-
-void make_r7780rp_irq(unsigned int irq)
-{
-        disable_irq_nosync(irq);
-        set_irq_chip_and_handler_name(irq, &r7780rp_irq_chip,
-                                      handle_level_irq, "level");
-        enable_r7780rp_irq(irq);
-}
diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c
index 0fdc0bc19145..a43b47726f54 100644
--- a/arch/sh/boards/renesas/r7780rp/setup.c
+++ b/arch/sh/boards/renesas/r7780rp/setup.c
@@ -179,9 +179,11 @@ static struct platform_device ax88796_device = {
 static struct platform_device *r7780rp_devices[] __initdata = {
         &r8a66597_usb_host_device,
         &m66592_usb_peripheral_device,
-        &cf_ide_device,
         &heartbeat_device,
+#ifndef CONFIG_SH_R7780RP
+        &cf_ide_device,
         &ax88796_device,
+#endif
 };
 
 static int __init r7780rp_devices_setup(void)
@@ -316,9 +318,9 @@ void __init highlander_init_irq(void)
                         break;
 #endif
 #ifdef CONFIG_SH_R7780RP
-                highlander_init_irq_r7780rp();
-                ucp = irl2irq;
-                break;
+                ucp = highlander_init_irq_r7780rp();
+                if (ucp)
+                        break;
 #endif
         } while (0);
 
diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c
index 7cc2813adfe4..8e49f6e51247 100644
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -13,7 +13,6 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <asm/voyagergx.h>
 #include <asm/rts7751r2d.h>
 
 #define R2D_NR_IRL 13
@@ -71,7 +70,7 @@ static unsigned char irl2irq_r2d_1[R2D_NR_IRL] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_r2d_1, "r2d-1", vectors_r2d_1,
-                         NULL, NULL, mask_registers_r2d_1, NULL, NULL);
+                         NULL, mask_registers_r2d_1, NULL, NULL);
 
 #endif /* CONFIG_RTS7751R2D_1 */
 
@@ -109,7 +108,7 @@ static unsigned char irl2irq_r2d_plus[R2D_NR_IRL] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_r2d_plus, "r2d-plus", vectors_r2d_plus,
-                         NULL, NULL, mask_registers_r2d_plus, NULL, NULL);
+                         NULL, mask_registers_r2d_plus, NULL, NULL);
 
 #endif /* CONFIG_RTS7751R2D_PLUS */
 
@@ -153,7 +152,4 @@ void __init init_rts7751r2d_IRQ(void)
         }
 
         register_intc_controller(d);
-#ifdef CONFIG_MFD_SM501
-        setup_voyagergx_irq();
-#endif
 }
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c
index 8125d20fdbd8..3452b072adde 100644
--- a/arch/sh/boards/renesas/rts7751r2d/setup.c
+++ b/arch/sh/boards/renesas/rts7751r2d/setup.c
@@ -13,34 +13,15 @@
 #include <linux/pata_platform.h>
 #include <linux/serial_8250.h>
 #include <linux/sm501.h>
+#include <linux/sm501-regs.h>
 #include <linux/pm.h>
+#include <linux/fb.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
 #include <asm/machvec.h>
 #include <asm/rts7751r2d.h>
-#include <asm/voyagergx.h>
 #include <asm/io.h>
-
-static void __init voyagergx_serial_init(void)
-{
-        unsigned long val;
-
-        /*
-         * GPIO Control
-         */
-        val = readl((void __iomem *)GPIO_MUX_HIGH);
-        val |= 0x00001fe0;
-        writel(val, (void __iomem *)GPIO_MUX_HIGH);
-
-        /*
-         * Power Mode Gate
-         */
-        val = readl((void __iomem *)POWER_MODE0_GATE);
-        val |= (POWER_MODE0_GATE_U0 | POWER_MODE0_GATE_U1);
-        writel(val, (void __iomem *)POWER_MODE0_GATE);
-
-        val = readl((void __iomem *)POWER_MODE1_GATE);
-        val |= (POWER_MODE1_GATE_U0 | POWER_MODE1_GATE_U1);
-        writel(val, (void __iomem *)POWER_MODE1_GATE);
-}
+#include <asm/spi.h>
 
 static struct resource cf_ide_resources[] = {
         [0] = {
@@ -75,6 +56,43 @@ static struct platform_device cf_ide_device  = {
         },
 };
 
+static struct spi_board_info spi_bus[] = {
+        {
+                .modalias       = "rtc-r9701",
+                .max_speed_hz   = 1000000,
+                .mode           = SPI_MODE_3,
+        },
+};
+
+static void r2d_chip_select(struct sh_spi_info *spi, int cs, int state)
+{
+        BUG_ON(cs != 0);  /* Single Epson RTC-9701JE attached on CS0 */
+        ctrl_outw(state == BITBANG_CS_ACTIVE, PA_RTCCE);
+}
+
+static struct sh_spi_info spi_info = {
+        .num_chipselect = 1,
+        .chip_select = r2d_chip_select,
+};
+
+static struct resource spi_sh_sci_resources[] = {
+        {
+                .start  = 0xffe00000,
+                .end    = 0xffe0001f,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device spi_sh_sci_device  = {
+        .name           = "spi_sh_sci",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(spi_sh_sci_resources),
+        .resource       = spi_sh_sci_resources,
+        .dev    = {
+                .platform_data  = &spi_info,
+        },
+};
+
 static struct resource heartbeat_resources[] = {
         [0] = {
                 .start  = PA_OUTPORT,
@@ -93,11 +111,11 @@ static struct platform_device heartbeat_device = {
 #ifdef CONFIG_MFD_SM501
 static struct plat_serial8250_port uart_platform_data[] = {
         {
-                .membase        = (void __iomem *)VOYAGER_UART_BASE,
-                .mapbase        = VOYAGER_UART_BASE,
+                .membase        = (void __iomem *)0xb3e30000,
+                .mapbase        = 0xb3e30000,
                 .iotype         = UPIO_MEM,
-                .irq            = IRQ_SM501_U0,
-                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+                .irq            = IRQ_VOYAGER,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ,
                 .regshift       = 2,
                 .uartclk        = (9600 * 16),
         },
@@ -124,14 +142,67 @@ static struct resource sm501_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [2]     = {
-                .start  = IRQ_SM501_CV,
+                .start  = IRQ_VOYAGER,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
+static struct fb_videomode sm501_default_mode = {
+        .pixclock       = 35714,
+        .xres           = 640,
+        .yres           = 480,
+        .left_margin    = 105,
+        .right_margin   = 50,
+        .upper_margin   = 35,
+        .lower_margin   = 0,
+        .hsync_len      = 96,
+        .vsync_len      = 2,
+        .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+};
+
+static struct sm501_platdata_fbsub sm501_pdata_fbsub_pnl = {
+        .def_bpp        = 16,
+        .def_mode       = &sm501_default_mode,
+        .flags          = SM501FB_FLAG_USE_INIT_MODE |
+                          SM501FB_FLAG_USE_HWCURSOR |
+                          SM501FB_FLAG_USE_HWACCEL |
+                          SM501FB_FLAG_DISABLE_AT_EXIT,
+};
+
+static struct sm501_platdata_fbsub sm501_pdata_fbsub_crt = {
+        .flags          = (SM501FB_FLAG_USE_INIT_MODE |
+                           SM501FB_FLAG_USE_HWCURSOR |
+                           SM501FB_FLAG_USE_HWACCEL |
+                           SM501FB_FLAG_DISABLE_AT_EXIT),
+
+};
+
+static struct sm501_platdata_fb sm501_fb_pdata = {
+        .fb_route       = SM501_FB_OWN,
+        .fb_crt         = &sm501_pdata_fbsub_crt,
+        .fb_pnl         = &sm501_pdata_fbsub_pnl,
+        .flags          = SM501_FBPD_SWAP_FB_ENDIAN,
+};
+
+static struct sm501_initdata sm501_initdata = {
+        .gpio_high      = {
+                .set    = 0x00001fe0,
+                .mask   = 0x0,
+        },
+        .devices        = SM501_USE_USB_HOST,
+};
+
+static struct sm501_platdata sm501_platform_data = {
+        .init           = &sm501_initdata,
+        .fb             = &sm501_fb_pdata,
+};
+
 static struct platform_device sm501_device = {
         .name           = "sm501",
         .id             = -1,
+        .dev            = {
+                .platform_data  = &sm501_platform_data,
+        },
         .num_resources  = ARRAY_SIZE(sm501_resources),
         .resource       = sm501_resources,
 };
@@ -145,10 +216,12 @@ static struct platform_device *rts7751r2d_devices[] __initdata = {
 #endif
         &cf_ide_device,
         &heartbeat_device,
+        &spi_sh_sci_device,
 };
 
 static int __init rts7751r2d_devices_setup(void)
 {
+        spi_register_board_info(spi_bus, ARRAY_SIZE(spi_bus));
         return platform_add_devices(rts7751r2d_devices,
                                     ARRAY_SIZE(rts7751r2d_devices));
 }
@@ -192,6 +265,7 @@ u8 rts7751r2d_readb(void __iomem *addr)
  */
 static void __init rts7751r2d_setup(char **cmdline_p)
 {
+        void __iomem *sm501_reg;
         u16 ver = ctrl_inw(PA_VERREG);
 
         printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n");
@@ -202,7 +276,30 @@ static void __init rts7751r2d_setup(char **cmdline_p)
         ctrl_outw(0x0000, PA_OUTPORT);
         pm_power_off = rts7751r2d_power_off;
 
-        voyagergx_serial_init();
+        /* sm501 dram configuration:
+         * ColSizeX = 11 - External Memory Column Size: 256 words.
+         * APX = 1 - External Memory Active to Pre-Charge Delay: 7 clocks.
+         * RstX = 1 - External Memory Reset: Normal.
+         * Rfsh = 1 - Local Memory Refresh to Command Delay: 12 clocks.
+         * BwC =  1 - Local Memory Block Write Cycle Time: 2 clocks.
+         * BwP =  1 - Local Memory Block Write to Pre-Charge Delay: 1 clock.
+         * AP = 1 - Internal Memory Active to Pre-Charge Delay: 7 clocks.
+         * Rst = 1 - Internal Memory Reset: Normal.
+         * RA = 1 - Internal Memory Remain in Active State: Do not remain.
+         */
+
+        sm501_reg = (void __iomem *)0xb3e00000 + SM501_DRAM_CONTROL;
+        writel(readl(sm501_reg) | 0x00f107c0, sm501_reg);
+
+        /*
+         * Power Mode Gate - Enable UART0
+         */
+
+        sm501_reg = (void __iomem *)0xb3e00000 + SM501_POWER_MODE_0_GATE;
+        writel(readl(sm501_reg) | (1 << SM501_GATE_UART0), sm501_reg);
+
+        sm501_reg = (void __iomem *)0xb3e00000 + SM501_POWER_MODE_1_GATE;
+        writel(readl(sm501_reg) | (1 << SM501_GATE_UART0), sm501_reg);
 }
 
 /*
@@ -215,8 +312,4 @@ static struct sh_machine_vector mv_rts7751r2d __initmv = {
         .mv_irq_demux           = rts7751r2d_irq_demux,
         .mv_writeb              = rts7751r2d_writeb,
         .mv_readb               = rts7751r2d_readb,
-#if defined(CONFIG_MFD_SM501) && defined(CONFIG_USB_OHCI_HCD)
-        .mv_consistent_alloc    = voyagergx_consistent_alloc,
-        .mv_consistent_free     = voyagergx_consistent_free,
-#endif
 };
diff --git a/arch/sh/boards/renesas/sdk7780/Kconfig b/arch/sh/boards/renesas/sdk7780/Kconfig
new file mode 100644
index 000000000000..e4f5b6985be1
--- /dev/null
+++ b/arch/sh/boards/renesas/sdk7780/Kconfig
@@ -0,0 +1,23 @@
+if SH_SDK7780
+
+choice
+        prompt "SDK7780 options"
+        default SH_SDK7780_BASE
+
+config SH_SDK7780_STANDALONE
+        bool "SDK7780 board support"
+        depends on CPU_SUBTYPE_SH7780
+        help
+          Selecting this option will enable support for the
+          standalone version of the SDK7780. If in doubt, say Y.
+
+config SH_SDK7780_BASE
+        bool "SDK7780 with base-board support"
+        depends on CPU_SUBTYPE_SH7780
+        help
+          Selecting this option will enable support for the expansion
+          baseboard devices. If in doubt, say Y.
+
+endchoice
+
+endif
diff --git a/arch/sh/boards/renesas/sdk7780/Makefile b/arch/sh/boards/renesas/sdk7780/Makefile
new file mode 100644
index 000000000000..3d8f0befc35d
--- /dev/null
+++ b/arch/sh/boards/renesas/sdk7780/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the SDK7780 specific parts of the kernel
+#
+obj-y    := setup.o irq.o
+
diff --git a/arch/sh/boards/renesas/sdk7780/irq.c b/arch/sh/boards/renesas/sdk7780/irq.c
new file mode 100644
index 000000000000..87cdc578f6ff
--- /dev/null
+++ b/arch/sh/boards/renesas/sdk7780/irq.c
@@ -0,0 +1,46 @@
+/*
+ * linux/arch/sh/boards/renesas/sdk7780/irq.c
+ *
+ * Renesas Technology Europe SDK7780 Support.
+ *
+ * Copyright (C) 2008  Nicholas Beck <nbeck@mpc-data.co.uk>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <asm/sdk7780.h>
+
+enum {
+        UNUSED = 0,
+        /* board specific interrupt sources */
+        SMC91C111,      /* Ethernet controller */
+};
+
+static struct intc_vect fpga_vectors[] __initdata = {
+        INTC_IRQ(SMC91C111, IRQ_ETHERNET),
+};
+
+static struct intc_mask_reg fpga_mask_registers[] __initdata = {
+        { 0, FPGA_IRQ0MR, 16,
+          { 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, SMC91C111, 0, 0, 0, 0 } },
+};
+
+static DECLARE_INTC_DESC(fpga_intc_desc, "sdk7780-irq", fpga_vectors,
+                         NULL, fpga_mask_registers, NULL, NULL);
+
+void __init init_sdk7780_IRQ(void)
+{
+        printk(KERN_INFO "Using SDK7780 interrupt controller.\n");
+
+        ctrl_outw(0xFFFF, FPGA_IRQ0MR);
+        /* Setup IRL 0-3 */
+        ctrl_outw(0x0003, FPGA_IMSR);
+        plat_irq_setup_pins(IRQ_MODE_IRL3210);
+
+        register_intc_controller(&fpga_intc_desc);
+}
diff --git a/arch/sh/boards/renesas/sdk7780/setup.c b/arch/sh/boards/renesas/sdk7780/setup.c
new file mode 100644
index 000000000000..5df32f201870
--- /dev/null
+++ b/arch/sh/boards/renesas/sdk7780/setup.c
@@ -0,0 +1,109 @@
+/*
+ * arch/sh/boards/renesas/sdk7780/setup.c
+ *
+ * Renesas Solutions SH7780 SDK Support
+ * Copyright (C) 2008 Nicholas Beck <nbeck@mpc-data.co.uk>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/platform_device.h>
+#include <linux/pata_platform.h>
+#include <asm/machvec.h>
+#include <asm/sdk7780.h>
+#include <asm/heartbeat.h>
+#include <asm/io.h>
+#include <asm/addrspace.h>
+
+#define GPIO_PECR        0xFFEA0008
+
+//* Heartbeat */
+static struct heartbeat_data heartbeat_data = {
+        .regsize = 16,
+};
+
+static struct resource heartbeat_resources[] = {
+        [0] = {
+                .start  = PA_LED,
+                .end    = PA_LED,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device heartbeat_device = {
+        .name           = "heartbeat",
+        .id             = -1,
+        .dev = {
+                .platform_data = &heartbeat_data,
+        },
+        .num_resources  = ARRAY_SIZE(heartbeat_resources),
+        .resource       = heartbeat_resources,
+};
+
+/* SMC91x */
+static struct resource smc91x_eth_resources[] = {
+        [0] = {
+                .name   = "smc91x-regs" ,
+                .start  = PA_LAN + 0x300,
+                .end    = PA_LAN + 0x300 + 0x10 ,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_ETHERNET,
+                .end    = IRQ_ETHERNET,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device smc91x_eth_device = {
+        .name           = "smc91x",
+        .id             = 0,
+        .dev = {
+                .dma_mask               = NULL,         /* don't use dma */
+                .coherent_dma_mask      = 0xffffffff,
+        },
+        .num_resources  = ARRAY_SIZE(smc91x_eth_resources),
+        .resource       = smc91x_eth_resources,
+};
+
+static struct platform_device *sdk7780_devices[] __initdata = {
+        &heartbeat_device,
+        &smc91x_eth_device,
+};
+
+static int __init sdk7780_devices_setup(void)
+{
+        return platform_add_devices(sdk7780_devices,
+                ARRAY_SIZE(sdk7780_devices));
+}
+device_initcall(sdk7780_devices_setup);
+
+static void __init sdk7780_setup(char **cmdline_p)
+{
+        u16 ver = ctrl_inw(FPGA_FPVERR);
+        u16 dateStamp = ctrl_inw(FPGA_FPDATER);
+
+        printk(KERN_INFO "Renesas Technology Europe SDK7780 support.\n");
+        printk(KERN_INFO "Board version: %d (revision %d), "
+                         "FPGA version: %d (revision %d), datestamp : %d\n",
+                         (ver >> 12) & 0xf, (ver >> 8) & 0xf,
+                         (ver >>  4) & 0xf, ver & 0xf,
+                         dateStamp);
+
+        /* Setup pin mux'ing for PCIC */
+        ctrl_outw(0x0000, GPIO_PECR);
+}
+
+/*
+ * The Machine Vector
+ */
+static struct sh_machine_vector mv_se7780 __initmv = {
+        .mv_name        = "Renesas SDK7780-R3" ,
+        .mv_setup               = sdk7780_setup,
+        .mv_nr_irqs             = 111,
+        .mv_init_irq    = init_sdk7780_IRQ,
+};
+
diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile
index 1b0f5be01d10..59f552c13349 100644
--- a/arch/sh/boot/Makefile
+++ b/arch/sh/boot/Makefile
@@ -35,17 +35,28 @@ $(obj)/compressed/vmlinux: FORCE
 KERNEL_LOAD     := $(shell /bin/bash -c 'printf "0x%8x" \
                      $$[$(CONFIG_PAGE_OFFSET)  + \
                         $(CONFIG_MEMORY_START) + \
+                        $(CONFIG_ZERO_PAGE_OFFSET)]')
+
+KERNEL_ENTRY    := $(shell /bin/bash -c 'printf "0x%8x" \
+                     $$[$(CONFIG_PAGE_OFFSET)  + \
+                        $(CONFIG_MEMORY_START) + \
                         $(CONFIG_ZERO_PAGE_OFFSET)+0x1000]')
 
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \
-                   -C none -a $(KERNEL_LOAD) -e $(KERNEL_LOAD) \
+                   -C none -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \
                    -n 'Linux-$(KERNELRELEASE)' -d $< $@
 
-$(obj)/uImage: $(obj)/zImage FORCE
+$(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE
         $(call if_changed,uimage)
         @echo '  Image $@ is ready'
 
+$(obj)/vmlinux.bin: vmlinux FORCE
+        $(call if_changed,objcopy)
+
+$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
+        $(call if_changed,gzip)
+
 OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec
 $(obj)/vmlinux.srec: $(obj)/compressed/vmlinux
         $(call if_changed,objcopy)
@@ -54,4 +65,5 @@ OBJCOPYFLAGS_uImage.srec := -I binary -O srec
 $(obj)/uImage.srec: $(obj)/uImage
         $(call if_changed,objcopy)
 
-clean-files     += uImage uImage.srec vmlinux.srec
+clean-files     += uImage uImage.srec vmlinux.srec \
+                   vmlinux.bin vmlinux.bin.gz
diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile
index 906a13f82fe0..efb01dc3c8c3 100644
--- a/arch/sh/boot/compressed/Makefile
+++ b/arch/sh/boot/compressed/Makefile
@@ -1,43 +1,5 @@
-#
-# linux/arch/sh/boot/compressed/Makefile
-#
-# create a compressed vmlinux image from the original vmlinux
-#
-
-targets         := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
-EXTRA_AFLAGS    := -traditional
-
-OBJECTS = $(obj)/head.o $(obj)/misc.o
-
-ifdef CONFIG_SH_STANDARD_BIOS
-OBJECTS += $(obj)/../../kernel/sh_bios.o
+ifeq ($(CONFIG_SUPERH32),y)
+include ${srctree}/arch/sh/boot/compressed/Makefile_32
+else
+include ${srctree}/arch/sh/boot/compressed/Makefile_64
 endif
-
-#
-# IMAGE_OFFSET is the load offset of the compression loader
-#
-IMAGE_OFFSET    := $(shell /bin/bash -c 'printf "0x%08x" \
-                     $$[$(CONFIG_PAGE_OFFSET)  + \
-                        $(CONFIG_MEMORY_START) + \
-                        $(CONFIG_BOOT_LINK_OFFSET)]')
-
-LIBGCC  := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
-
-LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup -T $(obj)/../../kernel/vmlinux.lds
-
-
-$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE
-        $(call if_changed,ld)
-        @:
-
-$(obj)/vmlinux.bin: vmlinux FORCE
-        $(call if_changed,objcopy)
-
-$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
-        $(call if_changed,gzip)
-
-LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh-linux -T
-OBJCOPYFLAGS += -R .empty_zero_page
-
-$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
-        $(call if_changed,ld)
diff --git a/arch/sh/boot/compressed/Makefile_32 b/arch/sh/boot/compressed/Makefile_32
new file mode 100644
index 000000000000..6ac8d4a4ed1d
--- /dev/null
+++ b/arch/sh/boot/compressed/Makefile_32
@@ -0,0 +1,43 @@
+#
+# linux/arch/sh/boot/compressed/Makefile
+#
+# create a compressed vmlinux image from the original vmlinux
+#
+
+targets         := vmlinux vmlinux.bin vmlinux.bin.gz \
+                   head_32.o misc_32.o piggy.o
+EXTRA_AFLAGS    := -traditional
+
+OBJECTS = $(obj)/head_32.o $(obj)/misc_32.o
+
+ifdef CONFIG_SH_STANDARD_BIOS
+OBJECTS += $(obj)/../../kernel/sh_bios.o
+endif
+
+#
+# IMAGE_OFFSET is the load offset of the compression loader
+#
+IMAGE_OFFSET    := $(shell /bin/bash -c 'printf "0x%08x" \
+                     $$[$(CONFIG_PAGE_OFFSET)  + \
+                        $(CONFIG_MEMORY_START) + \
+                        $(CONFIG_BOOT_LINK_OFFSET)]')
+
+LIBGCC  := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
+
+LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup -T $(obj)/../../kernel/vmlinux.lds
+
+$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE
+        $(call if_changed,ld)
+        @:
+
+$(obj)/vmlinux.bin: vmlinux FORCE
+        $(call if_changed,objcopy)
+
+$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
+        $(call if_changed,gzip)
+
+LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh-linux -T
+OBJCOPYFLAGS += -R .empty_zero_page
+
+$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
+        $(call if_changed,ld)
diff --git a/arch/sh64/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile_64
index 9cd216718856..4334f2b86d8f 100644
--- a/arch/sh64/boot/compressed/Makefile
+++ b/arch/sh/boot/compressed/Makefile_64
@@ -1,32 +1,32 @@
 #
-# linux/arch/sh64/boot/compressed/Makefile
+# arch/sh/boot/compressed/Makefile_64
 #
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
+# create a compressed vmlinux image from the original vmlinux
 #
 # Copyright (C) 2002 Stuart Menefy
 # Copyright (C) 2004 Paul Mundt
 #
-# create a compressed vmlinux image from the original vmlinux
+# This file is subject to the terms and conditions of the GNU General Public
+# License.  See the file "COPYING" in the main directory of this archive
+# for more details.
 #
 
 targets         := vmlinux vmlinux.bin vmlinux.bin.gz \
-                   head.o misc.o cache.o piggy.o vmlinux.lds
-
+                   head_64.o misc_64.o cache.o piggy.o
 EXTRA_AFLAGS    := -traditional
 
-OBJECTS         := $(obj)/head.o $(obj)/misc.o $(obj)/cache.o
+OBJECTS         := $(obj)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o \
+                   $(obj)/cache.o
 
 #
 # ZIMAGE_OFFSET is the load offset of the compression loader
 # (4M for the kernel plus 64K for this loader)
 #
-ZIMAGE_OFFSET = $(shell printf "0x%8x" $$[$(CONFIG_MEMORY_START)+0x400000+0x10000])
+ZIMAGE_OFFSET   := $(shell /bin/bash -c 'printf "0x%08x" \
+                     $$[$(CONFIG_PAGE_OFFSET)+0x400000+0x10000]')
 
 LDFLAGS_vmlinux := -Ttext $(ZIMAGE_OFFSET) -e startup \
-                    -T $(obj)/../../kernel/vmlinux.lds \
-                    --no-warn-mismatch
+                    -T $(obj)/../../kernel/vmlinux.lds
 
 $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE
         $(call if_changed,ld)
@@ -41,6 +41,5 @@ $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
 LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh64-linux -T
 OBJCOPYFLAGS += -R .empty_zero_page
 
-$(obj)/piggy.o: $(obj)/vmlinux.lds $(obj)/vmlinux.bin.gz FORCE
+$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
         $(call if_changed,ld)
-
diff --git a/arch/sh/boot/compressed/cache.c b/arch/sh/boot/compressed/cache.c
new file mode 100644
index 000000000000..e27fc74f228c
--- /dev/null
+++ b/arch/sh/boot/compressed/cache.c
@@ -0,0 +1,12 @@
+int cache_control(unsigned int command)
+{
+        volatile unsigned int *p = (volatile unsigned int *) 0x80000000;
+        int i;
+
+        for (i = 0; i < (32 * 1024); i += 32) {
+                (void)*p;
+                p += (32 / sizeof (int));
+        }
+
+        return 0;
+}
diff --git a/arch/sh/boot/compressed/head.S b/arch/sh/boot/compressed/head_32.S
index a8399b013729..a8399b013729 100644
--- a/arch/sh/boot/compressed/head.S
+++ b/arch/sh/boot/compressed/head_32.S
diff --git a/arch/sh64/boot/compressed/head.S b/arch/sh/boot/compressed/head_64.S
index 82040b1a29cf..1d4ecbfc767c 100644
--- a/arch/sh64/boot/compressed/head.S
+++ b/arch/sh/boot/compressed/head_64.S
@@ -13,11 +13,10 @@
  * Modification for compressed loader:
  *   Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com)
  */
-
 #include <linux/linkage.h>
-#include <asm/registers.h>
 #include <asm/cache.h>
-#include <asm/mmu_context.h>
+#include <asm/cpu/mmu_context.h>
+#include <asm/cpu/registers.h>
 
 /*
  * Fixed TLB entries to identity map the beginning of RAM
@@ -51,14 +50,14 @@ startup:
          * uninitialized target registers.
          * This must be executed before the first branch.
          */
-        ptabs/u ZERO, tr0
-        ptabs/u ZERO, tr1
-        ptabs/u ZERO, tr2
-        ptabs/u ZERO, tr3
-        ptabs/u ZERO, tr4
-        ptabs/u ZERO, tr5
-        ptabs/u ZERO, tr6
-        ptabs/u ZERO, tr7
+        ptabs/u r63, tr0
+        ptabs/u r63, tr1
+        ptabs/u r63, tr2
+        ptabs/u r63, tr3
+        ptabs/u r63, tr4
+        ptabs/u r63, tr5
+        ptabs/u r63, tr6
+        ptabs/u r63, tr7
         synci
 
         /*
@@ -69,7 +68,7 @@ startup:
         pta     1f, tr1
         movi    ITLB_FIXED, r21
         movi    ITLB_LAST_VAR_UNRESTRICTED+TLB_STEP, r22
-1:      putcfg  r21, 0, ZERO            /* Clear MMUIR[n].PTEH.V */
+1:      putcfg  r21, 0, r63             /* Clear MMUIR[n].PTEH.V */
         addi    r21, TLB_STEP, r21
         bne     r21, r22, tr1
 
@@ -77,7 +76,7 @@ startup:
         pta     1f, tr1
         movi    DTLB_FIXED, r21
         movi    DTLB_LAST_VAR_UNRESTRICTED+TLB_STEP, r22
-1:      putcfg  r21, 0, ZERO            /* Clear MMUDR[n].PTEH.V */
+1:      putcfg  r21, 0, r63             /* Clear MMUDR[n].PTEH.V */
         addi    r21, TLB_STEP, r21
         bne     r21, r22, tr1
 
@@ -133,7 +132,7 @@ startup:
         pt      1f, tr1
         movi    datalabel __bss_start, r22
         movi    datalabel _end, r23
-1:      st.l    r22, 0, ZERO
+1:      st.l    r22, 0, r63
         addi    r22, 4, r22
         bne     r22, r23, tr1
 
@@ -161,4 +160,4 @@ startup:
 
         /* Shouldn't return here, but just in case, loop forever */
         pt      1f, tr0
-1:      blink   tr0, ZERO
+1:      blink   tr0, r63
diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc_32.c
index df65e305acf7..adcea31e663e 100644
--- a/arch/sh/boot/compressed/misc.c
+++ b/arch/sh/boot/compressed/misc_32.c
@@ -230,7 +230,10 @@ long* stack_start = &user_stack[STACK_SIZE];
 void decompress_kernel(void)
 {
         output_data = 0;
-        output_ptr = P2SEGADDR((unsigned long)&_text+PAGE_SIZE);
+        output_ptr = PHYSADDR((unsigned long)&_text+PAGE_SIZE);
+#ifdef CONFIG_29BIT
+        output_ptr |= P2SEG;
+#endif
         free_mem_ptr = (unsigned long)&_end;
         free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
 
diff --git a/arch/sh64/boot/compressed/misc.c b/arch/sh/boot/compressed/misc_64.c
index aea00c53ce29..a006ef89b9dd 100644
--- a/arch/sh64/boot/compressed/misc.c
+++ b/arch/sh/boot/compressed/misc_64.c
@@ -1,5 +1,5 @@
 /*
- * arch/sh64/boot/compressed/misc.c
+ * arch/sh/boot/compressed/misc_64.c
  *
  * This is a collection of several routines from gzip-1.0.3
  * adapted for Linux.
diff --git a/arch/sh64/boot/compressed/vmlinux.lds.S b/arch/sh/boot/compressed/vmlinux_64.lds
index 59c2ef4aeda5..59c2ef4aeda5 100644
--- a/arch/sh64/boot/compressed/vmlinux.lds.S
+++ b/arch/sh/boot/compressed/vmlinux_64.lds
diff --git a/arch/sh/cchips/voyagergx/Makefile b/arch/sh/cchips/voyagergx/Makefile
deleted file mode 100644
index f73963cb3744..000000000000
--- a/arch/sh/cchips/voyagergx/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for VoyagerGX
-#
-
-obj-y   := irq.o setup.o
-
-obj-$(CONFIG_USB_OHCI_HCD)      += consistent.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/sh/cchips/voyagergx/consistent.c b/arch/sh/cchips/voyagergx/consistent.c
deleted file mode 100644
index 07e8b9c5a531..000000000000
--- a/arch/sh/cchips/voyagergx/consistent.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * arch/sh/cchips/voyagergx/consistent.c
- *
- * Copyright (C) 2004  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/mm.h>
-#include <linux/dma-mapping.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <asm/io.h>
-
-
-struct voya_alloc_entry {
-        struct list_head list;
-        unsigned long ofs;
-        unsigned long len;
-};
-
-static DEFINE_SPINLOCK(voya_list_lock);
-static LIST_HEAD(voya_alloc_list);
-
-#define OHCI_SRAM_START 0xb0000000
-#define OHCI_HCCA_SIZE  0x100
-#define OHCI_SRAM_SIZE  0x10000
-
-#define VOYAGER_OHCI_NAME       "voyager-ohci"
-
-void *voyagergx_consistent_alloc(struct device *dev, size_t size,
-                                 dma_addr_t *handle, gfp_t flag)
-{
-        struct list_head *list = &voya_alloc_list;
-        struct voya_alloc_entry *entry;
-        unsigned long start, end;
-        unsigned long flags;
-
-        /*
-         * The SM501 contains an integrated 8051 with its own SRAM.
-         * Devices within the cchip can all hook into the 8051 SRAM.
-         * We presently use this for the OHCI.
-         *
-         * Everything else goes through consistent_alloc().
-         */
-        if (!dev || strcmp(dev->driver->name, VOYAGER_OHCI_NAME))
-                return NULL;
-
-        start = OHCI_SRAM_START + OHCI_HCCA_SIZE;
-
-        entry = kmalloc(sizeof(struct voya_alloc_entry), GFP_ATOMIC);
-        if (!entry)
-                return ERR_PTR(-ENOMEM);
-
-        entry->len = (size + 15) & ~15;
-
-        /*
-         * The basis for this allocator is dwmw2's malloc.. the
-         * Matrox allocator :-)
-         */
-        spin_lock_irqsave(&voya_list_lock, flags);
-        list_for_each(list, &voya_alloc_list) {
-                struct voya_alloc_entry *p;
-
-                p = list_entry(list, struct voya_alloc_entry, list);
-
-                if (p->ofs - start >= size)
-                        goto out;
-
-                start = p->ofs + p->len;
-        }
-
-        end  = start + (OHCI_SRAM_SIZE  - OHCI_HCCA_SIZE);
-        list = &voya_alloc_list;
-
-        if (end - start >= size) {
-out:
-                entry->ofs = start;
-                list_add_tail(&entry->list, list);
-                spin_unlock_irqrestore(&voya_list_lock, flags);
-
-                *handle = start;
-                return (void *)start;
-        }
-
-        kfree(entry);
-        spin_unlock_irqrestore(&voya_list_lock, flags);
-
-        return ERR_PTR(-EINVAL);
-}
-
-int voyagergx_consistent_free(struct device *dev, size_t size,
-                              void *vaddr, dma_addr_t handle)
-{
-        struct voya_alloc_entry *entry;
-        unsigned long flags;
-
-        if (!dev || strcmp(dev->driver->name, VOYAGER_OHCI_NAME))
-                return -EINVAL;
-
-        spin_lock_irqsave(&voya_list_lock, flags);
-        list_for_each_entry(entry, &voya_alloc_list, list) {
-                if (entry->ofs != handle)
-                        continue;
-
-                list_del(&entry->list);
-                kfree(entry);
-
-                break;
-        }
-        spin_unlock_irqrestore(&voya_list_lock, flags);
-
-        return 0;
-}
-
-EXPORT_SYMBOL(voyagergx_consistent_alloc);
-EXPORT_SYMBOL(voyagergx_consistent_free);
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c
deleted file mode 100644
index ade303876841..000000000000
--- a/arch/sh/cchips/voyagergx/irq.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -------------------------------------------------------------------- */
-/* setup_voyagergx.c:                                                     */
-/* -------------------------------------------------------------------- */
-/*  This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    Copyright 2003 (c) Lineo uSolutions,Inc.
-*/
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <asm/voyagergx.h>
-#include <asm/rts7751r2d.h>
-
-enum {
-        UNUSED = 0,
-
-        /* voyager specific interrupt sources */
-        UP, G54, G53, G52, G51, G50, G49, G48,
-        I2C, PW, DMA, PCI, I2S, AC, US,
-        U1, U0, CV, MC, S1, S0,
-        UH, TWOD, ZD, PV, CI,
-};
-
-static struct intc_vect vectors[] __initdata = {
-        INTC_IRQ(UP, IRQ_SM501_UP), INTC_IRQ(G54, IRQ_SM501_G54),
-        INTC_IRQ(G53, IRQ_SM501_G53), INTC_IRQ(G52, IRQ_SM501_G52),
-        INTC_IRQ(G51, IRQ_SM501_G51), INTC_IRQ(G50, IRQ_SM501_G50),
-        INTC_IRQ(G49, IRQ_SM501_G49), INTC_IRQ(G48, IRQ_SM501_G48),
-        INTC_IRQ(I2C, IRQ_SM501_I2C), INTC_IRQ(PW, IRQ_SM501_PW),
-        INTC_IRQ(DMA, IRQ_SM501_DMA), INTC_IRQ(PCI, IRQ_SM501_PCI),
-        INTC_IRQ(I2S, IRQ_SM501_I2S), INTC_IRQ(AC, IRQ_SM501_AC),
-        INTC_IRQ(US, IRQ_SM501_US), INTC_IRQ(U1, IRQ_SM501_U1),
-        INTC_IRQ(U0, IRQ_SM501_U0), INTC_IRQ(CV, IRQ_SM501_CV),
-        INTC_IRQ(MC, IRQ_SM501_MC), INTC_IRQ(S1, IRQ_SM501_S1),
-        INTC_IRQ(S0, IRQ_SM501_S0), INTC_IRQ(UH, IRQ_SM501_UH),
-        INTC_IRQ(TWOD, IRQ_SM501_2D), INTC_IRQ(ZD, IRQ_SM501_ZD),
-        INTC_IRQ(PV, IRQ_SM501_PV), INTC_IRQ(CI, IRQ_SM501_CI),
-};
-
-static struct intc_mask_reg mask_registers[] __initdata = {
-        { VOYAGER_INT_MASK, 0, 32, /* "Interrupt Mask", MMIO_base + 0x30 */
-          { UP, G54, G53, G52, G51, G50, G49, G48,
-            I2C, PW, 0, DMA, PCI, I2S, AC, US,
-            0, 0, U1, U0, CV, MC, S1, S0,
-            0, UH, 0, 0, TWOD, ZD, PV, CI } },
-};
-
-static DECLARE_INTC_DESC(intc_desc, "voyagergx", vectors,
-                         NULL, NULL, mask_registers, NULL, NULL);
-
-static unsigned int voyagergx_stat2irq[32] = {
-        IRQ_SM501_CI, IRQ_SM501_PV, IRQ_SM501_ZD, IRQ_SM501_2D,
-        0, 0, IRQ_SM501_UH, 0,
-        IRQ_SM501_S0, IRQ_SM501_S1, IRQ_SM501_MC, IRQ_SM501_CV,
-        IRQ_SM501_U0, IRQ_SM501_U1, 0, 0,
-        IRQ_SM501_US, IRQ_SM501_AC, IRQ_SM501_I2S, IRQ_SM501_PCI,
-        IRQ_SM501_DMA, 0, IRQ_SM501_PW, IRQ_SM501_I2C,
-        IRQ_SM501_G48, IRQ_SM501_G49, IRQ_SM501_G50, IRQ_SM501_G51,
-        IRQ_SM501_G52, IRQ_SM501_G53, IRQ_SM501_G54, IRQ_SM501_UP
-};
-
-static void voyagergx_irq_demux(unsigned int irq, struct irq_desc *desc)
-{
-        unsigned long intv = ctrl_inl(INT_STATUS);
-        struct irq_desc *ext_desc;
-        unsigned int ext_irq;
-        unsigned int k = 0;
-
-        while (intv) {
-                ext_irq = voyagergx_stat2irq[k];
-                if (ext_irq && (intv & 1)) {
-                        ext_desc = irq_desc + ext_irq;
-                        handle_level_irq(ext_irq, ext_desc);
-                }
-                intv >>= 1;
-                k++;
-        }
-}
-
-void __init setup_voyagergx_irq(void)
-{
-        printk(KERN_INFO "VoyagerGX on irq %d (mapped into %d to %d)\n",
-               IRQ_VOYAGER,
-               VOYAGER_IRQ_BASE,
-               VOYAGER_IRQ_BASE + VOYAGER_IRQ_NUM - 1);
-
-        register_intc_controller(&intc_desc);
-        set_irq_chained_handler(IRQ_VOYAGER, voyagergx_irq_demux);
-}
diff --git a/arch/sh/cchips/voyagergx/setup.c b/arch/sh/cchips/voyagergx/setup.c
deleted file mode 100644
index 33f03027c193..000000000000
--- a/arch/sh/cchips/voyagergx/setup.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * arch/sh/cchips/voyagergx/setup.c
- *
- * Setup routines for VoyagerGX cchip.
- *
- * Copyright (C) 2003 Lineo uSolutions, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-#include <linux/init.h>
-#include <linux/module.h>
-#include <asm/io.h>
-#include <asm/voyagergx.h>
-
-static int __init setup_voyagergx(void)
-{
-        unsigned long val;
-
-        val = readl((void __iomem *)DRAM_CTRL);
-        val |= (DRAM_CTRL_CPU_COLUMN_SIZE_256   |
-                DRAM_CTRL_CPU_ACTIVE_PRECHARGE  |
-                DRAM_CTRL_CPU_RESET             |
-                DRAM_CTRL_REFRESH_COMMAND       |
-                DRAM_CTRL_BLOCK_WRITE_TIME      |
-                DRAM_CTRL_BLOCK_WRITE_PRECHARGE |
-                DRAM_CTRL_ACTIVE_PRECHARGE      |
-                DRAM_CTRL_RESET                 |
-                DRAM_CTRL_REMAIN_ACTIVE);
-        writel(val, (void __iomem *)DRAM_CTRL);
-
-        return 0;
-}
-
-module_init(setup_voyagergx);
diff --git a/arch/sh64/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig
index 75552bb01405..a05b278d72f5 100644
--- a/arch/sh64/configs/cayman_defconfig
+++ b/arch/sh/configs/cayman_defconfig
@@ -1,18 +1,22 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rc1
-# Fri Nov  2 14:35:27 2007
+# Linux kernel version: 2.6.24-rc3
+# Fri Nov 23 14:15:55 2007
 #
 CONFIG_SUPERH=y
+# CONFIG_SUPERH32 is not set
 CONFIG_SUPERH64=y
-CONFIG_MMU=y
-CONFIG_QUICKLIST=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME is not set
+# CONFIG_GENERIC_CLOCKEVENTS is not set
+CONFIG_SYS_SUPPORTS_PCI=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_NO_VIRT_TO_BUS=y
@@ -33,6 +37,7 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -45,7 +50,7 @@ CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
-# CONFIG_EMBEDDED is not set
+CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
@@ -97,73 +102,153 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 #
 # System type
 #
-# CONFIG_SH_SIMULATOR is not set
-CONFIG_SH_CAYMAN=y
-# CONFIG_SH_HARP is not set
 CONFIG_CPU_SH5=y
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7706 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+# CONFIG_CPU_SUBTYPE_SH7710 is not set
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
+# CONFIG_CPU_SUBTYPE_SH7720 is not set
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
+# CONFIG_CPU_SUBTYPE_SHX3 is not set
+# CONFIG_CPU_SUBTYPE_SH7343 is not set
+# CONFIG_CPU_SUBTYPE_SH7722 is not set
 CONFIG_CPU_SUBTYPE_SH5_101=y
 # CONFIG_CPU_SUBTYPE_SH5_103 is not set
-CONFIG_LITTLE_ENDIAN=y
-# CONFIG_BIG_ENDIAN is not set
-CONFIG_SH_FPU=y
-# CONFIG_SH64_FPU_DENORM_FLUSH is not set
-CONFIG_SH64_PGTABLE_2_LEVEL=y
-# CONFIG_SH64_PGTABLE_3_LEVEL is not set
+
+#
+# Memory management options
+#
+CONFIG_QUICKLIST=y
+CONFIG_MMU=y
+CONFIG_PAGE_OFFSET=0x20000000
+CONFIG_MEMORY_START=0x80000000
+CONFIG_MEMORY_SIZE=0x00400000
+CONFIG_32BIT=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
 CONFIG_HUGETLB_PAGE_SIZE_64K=y
+# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
 # CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
 # CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+# CONFIG_CACHE_WRITEBACK is not set
+# CONFIG_CACHE_WRITETHROUGH is not set
+CONFIG_CACHE_OFF=y
+
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_SH_FPU=y
+# CONFIG_SH64_FPU_DENORM_FLUSH is not set
 CONFIG_SH64_USER_MISALIGNED_FIXUP=y
+CONFIG_SH64_ID2815_WORKAROUND=y
+CONFIG_CPU_HAS_FPU=y
 
 #
-# Memory options
+# Board support
 #
-CONFIG_CACHED_MEMORY_OFFSET=0x20000000
-CONFIG_MEMORY_START=0x80000000
-CONFIG_MEMORY_SIZE_IN_MB=128
+CONFIG_SH_CAYMAN=y
 
 #
-# Cache options
+# Timer and clock configuration
 #
-CONFIG_DCACHE_WRITE_BACK=y
-# CONFIG_DCACHE_WRITE_THROUGH is not set
-# CONFIG_DCACHE_DISABLED is not set
-# CONFIG_ICACHE_DISABLED is not set
-CONFIG_PCIDEVICE_MEMORY_START=C0000000
-CONFIG_DEVICE_MEMORY_START=E0000000
-CONFIG_FLASH_MEMORY_START=0x00000000
-CONFIG_PCI_BLOCK_START=0x40000000
+CONFIG_SH_TIMER_IRQ=16
+CONFIG_SH_PCLK_FREQ=50000000
+# CONFIG_TICK_ONESHOT is not set
 
 #
-# CPU Subtype specific options
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
 #
-CONFIG_SH64_ID2815_WORKAROUND=y
 
 #
-# Misc options
+# Companion Chips
+#
+
+#
+# Additional SuperH Device Drivers
 #
 CONFIG_HEARTBEAT=y
-CONFIG_HDSP253_LED=y
-# CONFIG_SH_DMA is not set
+# CONFIG_PUSH_SWITCH is not set
+
+#
+# Kernel features
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_NR_QUICK=1
+CONFIG_PREEMPT_BKL=y
+CONFIG_GUSA=y
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+# CONFIG_CMDLINE_BOOL is not set
 
 #
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+# Bus options
 #
 CONFIG_PCI=y
 CONFIG_SH_PCIDMA_NONCOHERENT=y
+CONFIG_PCI_AUTO=y
+CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCI_LEGACY=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
@@ -354,11 +439,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
 # CONFIG_SCSI_STEX is not set
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
+# CONFIG_SCSI_SYM53C8XX_2 is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
 # CONFIG_SCSI_QLA_ISCSI is not set
@@ -391,6 +472,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_PHYLIB is not set
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
+# CONFIG_AX88796 is not set
 # CONFIG_STNIC is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
@@ -398,40 +480,14 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_SMC91X is not set
 # CONFIG_SMC911X is not set
-CONFIG_NET_TULIP=y
-# CONFIG_DE2104X is not set
-CONFIG_TULIP=y
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-# CONFIG_DE4X5 is not set
-# CONFIG_WINBOND_840 is not set
-# CONFIG_DM9102 is not set
-# CONFIG_ULI526X is not set
+# CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-CONFIG_NET_PCI=y
-# CONFIG_PCNET32 is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_NET_PCI is not set
 # CONFIG_B44 is not set
-# CONFIG_FORCEDETH is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_E100 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_SC92031 is not set
 CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
@@ -492,7 +548,7 @@ CONFIG_INPUT=y
 # Userland interfaces
 #
 CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
@@ -502,24 +558,8 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 #
 # Input Device Drivers
 #
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
@@ -528,12 +568,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -553,11 +588,7 @@ CONFIG_HW_CONSOLE=y
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=2
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_SH_SCI is not set
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
@@ -642,6 +673,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_ADT7470 is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_F71882FG is not set
 # CONFIG_SENSORS_F75375S is not set
@@ -832,9 +864,9 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
@@ -866,7 +898,7 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
-CONFIG_FB_KYRO=y
+# CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
@@ -1062,6 +1094,7 @@ CONFIG_INSTRUMENTATION=y
 #
 # Kernel hacking
 #
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
@@ -1076,10 +1109,14 @@ CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1094,8 +1131,11 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_SAMPLES is not set
-# CONFIG_EARLY_PRINTK is not set
-CONFIG_SH64_PROC_TLB=y
+# CONFIG_SH_STANDARD_BIOS is not set
+# CONFIG_EARLY_SCIF_CONSOLE is not set
+# CONFIG_DEBUG_BOOTMEM is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_4KSTACKS is not set
 CONFIG_SH64_PROC_ASIDS=y
 CONFIG_SH64_SR_WATCH=y
 # CONFIG_POOR_MANS_STRACE is not set
diff --git a/arch/sh/configs/hs7751rvoip_defconfig b/arch/sh/configs/hs7751rvoip_defconfig
deleted file mode 100644
index 5d9da5a02759..000000000000
--- a/arch/sh/configs/hs7751rvoip_defconfig
+++ /dev/null
@@ -1,908 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18
-# Tue Oct  3 13:04:52 2006
-#
-CONFIG_SUPERH=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
-
-#
-# Block layer
-#
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-
-#
-# System type
-#
-# CONFIG_SH_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-# CONFIG_SH_7300_SOLUTION_ENGINE is not set
-# CONFIG_SH_7343_SOLUTION_ENGINE is not set
-# CONFIG_SH_73180_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_HP6XX is not set
-# CONFIG_SH_EC3104 is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_BIGSUR is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SH03 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-CONFIG_SH_HS7751RVOIP=y
-# CONFIG_SH_7710VOIPGW is not set
-# CONFIG_SH_RTS7751R2D is not set
-# CONFIG_SH_R7780RP is not set
-# CONFIG_SH_EDOSK7705 is not set
-# CONFIG_SH_SH4202_MICRODEV is not set
-# CONFIG_SH_LANDISK is not set
-# CONFIG_SH_TITAN is not set
-# CONFIG_SH_SHMIN is not set
-# CONFIG_SH_UNKNOWN is not set
-
-#
-# Processor selection
-#
-CONFIG_CPU_SH4=y
-
-#
-# SH-2 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
-
-#
-# SH-3 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7300 is not set
-# CONFIG_CPU_SUBTYPE_SH7705 is not set
-# CONFIG_CPU_SUBTYPE_SH7706 is not set
-# CONFIG_CPU_SUBTYPE_SH7707 is not set
-# CONFIG_CPU_SUBTYPE_SH7708 is not set
-# CONFIG_CPU_SUBTYPE_SH7709 is not set
-# CONFIG_CPU_SUBTYPE_SH7710 is not set
-
-#
-# SH-4 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7750 is not set
-# CONFIG_CPU_SUBTYPE_SH7091 is not set
-# CONFIG_CPU_SUBTYPE_SH7750R is not set
-# CONFIG_CPU_SUBTYPE_SH7750S is not set
-# CONFIG_CPU_SUBTYPE_SH7751 is not set
-CONFIG_CPU_SUBTYPE_SH7751R=y
-# CONFIG_CPU_SUBTYPE_SH7760 is not set
-# CONFIG_CPU_SUBTYPE_SH4_202 is not set
-
-#
-# ST40 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-
-#
-# SH-4A Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7770 is not set
-# CONFIG_CPU_SUBTYPE_SH7780 is not set
-
-#
-# SH4AL-DSP Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH73180 is not set
-# CONFIG_CPU_SUBTYPE_SH7343 is not set
-
-#
-# Memory management options
-#
-CONFIG_MMU=y
-CONFIG_PAGE_OFFSET=0x80000000
-CONFIG_MEMORY_START=0x0c000000
-CONFIG_MEMORY_SIZE=0x04000000
-CONFIG_VSYSCALL=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-
-#
-# Cache configuration
-#
-# CONFIG_SH_DIRECT_MAPPED is not set
-# CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
-
-#
-# Processor features
-#
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SH_FPU=y
-# CONFIG_SH_DSP is not set
-# CONFIG_SH_STORE_QUEUES is not set
-CONFIG_CPU_HAS_INTEVT=y
-CONFIG_CPU_HAS_SR_RB=y
-
-#
-# Timer support
-#
-CONFIG_SH_TMU=y
-
-#
-# HS7751RVoIP options
-#
-CONFIG_HS7751RVOIP_CODEC=y
-CONFIG_SH_PCLK_FREQ=60000000
-
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-
-#
-# DMA support
-#
-# CONFIG_SH_DMA is not set
-
-#
-# Companion Chips
-#
-# CONFIG_HD6446X_SERIES is not set
-
-#
-# Kernel features
-#
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
-# CONFIG_KEXEC is not set
-# CONFIG_SMP is not set
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_BKL=y
-
-#
-# Boot options
-#
-CONFIG_ZERO_PAGE_OFFSET=0x00001000
-CONFIG_BOOT_LINK_OFFSET=0x00800000
-# CONFIG_UBC_WAKEUP is not set
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="mem=64M console=ttySC1,115200 root=/dev/hda1"
-
-#
-# Bus options
-#
-# CONFIG_PCI is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-# CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Power management options (EXPERIMENTAL)
-#
-# CONFIG_PM is not set
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-# CONFIG_NETDEBUG is not set
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_MULTIPLE_TABLES is not set
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_IEEE80211 is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
-# CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-# CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=1
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_IDE_ARM is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-
-#
-# PHY device support
-#
-# CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-# CONFIG_STNIC is not set
-# CONFIG_SMC91X is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_RAW is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-# CONFIG_VT is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=2
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
-
-#
-# Hardware Monitoring support
-#
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Misc devices
-#
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# USB support
-#
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
-# CONFIG_RTC_CLASS is not set
-
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-# CONFIG_NFSD is not set
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_RPCSEC_GSS_KRB5=y
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_SH_STANDARD_BIOS is not set
-# CONFIG_EARLY_SCIF_CONSOLE is not set
-# CONFIG_KGDB is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_MANAGER=m
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
-
-#
-# Library routines
-#
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
-CONFIG_PLIST=y
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig
index 2e43a2a971a9..0dc1ce7b9349 100644
--- a/arch/sh/configs/r7785rp_defconfig
+++ b/arch/sh/configs/r7785rp_defconfig
@@ -1,9 +1,10 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rc2
-# Tue Nov 13 20:34:57 2007
+# Linux kernel version: 2.6.24-rc3
+# Fri Nov 23 14:03:57 2007
 #
 CONFIG_SUPERH=y
+CONFIG_SUPERH32=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -39,6 +40,7 @@ CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -130,6 +132,8 @@ CONFIG_CPU_SUBTYPE_SH7785=y
 # CONFIG_CPU_SUBTYPE_SHX3 is not set
 # CONFIG_CPU_SUBTYPE_SH7343 is not set
 # CONFIG_CPU_SUBTYPE_SH7722 is not set
+# CONFIG_CPU_SUBTYPE_SH5_101 is not set
+# CONFIG_CPU_SUBTYPE_SH5_103 is not set
 
 #
 # Memory management options
@@ -139,7 +143,8 @@ CONFIG_MMU=y
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_MEMORY_START=0x08000000
 CONFIG_MEMORY_SIZE=0x08000000
-# CONFIG_32BIT is not set
+CONFIG_29BIT=y
+# CONFIG_PMB is not set
 # CONFIG_X2TLB is not set
 CONFIG_VSYSCALL=y
 # CONFIG_NUMA is not set
@@ -158,6 +163,7 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_HUGETLB_PAGE_SIZE_1MB=y
 # CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
 # CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_FLATMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -701,6 +707,7 @@ CONFIG_DEVPORT=y
 # CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_F71882FG is not set
 # CONFIG_SENSORS_IT87 is not set
diff --git a/arch/sh/configs/r7780rp_defconfig b/arch/sh/configs/sdk7780_defconfig
index 12cc01910cf8..bb9bcd6591ab 100644
--- a/arch/sh/configs/r7780rp_defconfig
+++ b/arch/sh/configs/sdk7780_defconfig
@@ -1,9 +1,10 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc7
-# Tue May  1 12:28:39 2007
+# Linux kernel version: 2.6.24-rc7
+# Tue Jan 22 11:34:03 2008
 #
 CONFIG_SUPERH=y
+CONFIG_SUPERH32=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -11,149 +12,107 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_SYS_SUPPORTS_PCI=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="_SDK7780"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
+CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_RELAY is not set
+CONFIG_LOG_BUF_SHIFT=18
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_RELAY=y
 # CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-# CONFIG_FUTEX is not set
-# CONFIG_EPOLL is not set
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
-# CONFIG_LBD is not set
+CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
 
 #
 # System type
 #
-# CONFIG_SH_SOLUTION_ENGINE is not set
-# CONFIG_SH_7722_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-# CONFIG_SH_7780_SOLUTION_ENGINE is not set
-# CONFIG_SH_7300_SOLUTION_ENGINE is not set
-# CONFIG_SH_7343_SOLUTION_ENGINE is not set
-# CONFIG_SH_73180_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_HP6XX is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SH03 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-# CONFIG_SH_HS7751RVOIP is not set
-# CONFIG_SH_7710VOIPGW is not set
-# CONFIG_SH_RTS7751R2D is not set
-CONFIG_SH_HIGHLANDER=y
-# CONFIG_SH_EDOSK7705 is not set
-# CONFIG_SH_SH4202_MICRODEV is not set
-# CONFIG_SH_LANDISK is not set
-# CONFIG_SH_TITAN is not set
-# CONFIG_SH_SHMIN is not set
-# CONFIG_SH_7206_SOLUTION_ENGINE is not set
-# CONFIG_SH_7619_SOLUTION_ENGINE is not set
-# CONFIG_SH_LBOX_RE2 is not set
-# CONFIG_SH_UNKNOWN is not set
-CONFIG_SH_R7780RP=y
-# CONFIG_SH_R7780MP is not set
-# CONFIG_SH_R7785RP is not set
-
-#
-# Processor selection
-#
 CONFIG_CPU_SH4=y
 CONFIG_CPU_SH4A=y
-
-#
-# SH-2 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
 # CONFIG_CPU_SUBTYPE_SH7619 is not set
-
-#
-# SH-2A Processor Support
-#
+# CONFIG_CPU_SUBTYPE_SH7203 is not set
 # CONFIG_CPU_SUBTYPE_SH7206 is not set
-
-#
-# SH-3 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7263 is not set
 # CONFIG_CPU_SUBTYPE_SH7705 is not set
 # CONFIG_CPU_SUBTYPE_SH7706 is not set
 # CONFIG_CPU_SUBTYPE_SH7707 is not set
@@ -161,10 +120,8 @@ CONFIG_CPU_SH4A=y
 # CONFIG_CPU_SUBTYPE_SH7709 is not set
 # CONFIG_CPU_SUBTYPE_SH7710 is not set
 # CONFIG_CPU_SUBTYPE_SH7712 is not set
-
-#
-# SH-4 Processor Support
-#
+# CONFIG_CPU_SUBTYPE_SH7720 is not set
+# CONFIG_CPU_SUBTYPE_SH7721 is not set
 # CONFIG_CPU_SUBTYPE_SH7750 is not set
 # CONFIG_CPU_SUBTYPE_SH7091 is not set
 # CONFIG_CPU_SUBTYPE_SH7750R is not set
@@ -173,38 +130,33 @@ CONFIG_CPU_SH4A=y
 # CONFIG_CPU_SUBTYPE_SH7751R is not set
 # CONFIG_CPU_SUBTYPE_SH7760 is not set
 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
-
-#
-# ST40 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-
-#
-# SH-4A Processor Support
-#
+# CONFIG_CPU_SUBTYPE_SH7763 is not set
 # CONFIG_CPU_SUBTYPE_SH7770 is not set
 CONFIG_CPU_SUBTYPE_SH7780=y
 # CONFIG_CPU_SUBTYPE_SH7785 is not set
-
-#
-# SH4AL-DSP Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SHX3 is not set
 # CONFIG_CPU_SUBTYPE_SH7343 is not set
 # CONFIG_CPU_SUBTYPE_SH7722 is not set
+# CONFIG_CPU_SUBTYPE_SH5_101 is not set
+# CONFIG_CPU_SUBTYPE_SH5_103 is not set
 
 #
 # Memory management options
 #
+CONFIG_QUICKLIST=y
 CONFIG_MMU=y
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_MEMORY_START=0x08000000
 CONFIG_MEMORY_SIZE=0x08000000
-# CONFIG_32BIT is not set
+CONFIG_29BIT=y
+# CONFIG_PMB is not set
 CONFIG_VSYSCALL=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
 CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
@@ -213,23 +165,27 @@ CONFIG_HUGETLB_PAGE_SIZE_64K=y
 # CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
 # CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
 # CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
+CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
 
 #
 # Cache configuration
 #
 # CONFIG_SH_DIRECT_MAPPED is not set
-# CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
+CONFIG_CACHE_WRITEBACK=y
+# CONFIG_CACHE_WRITETHROUGH is not set
+# CONFIG_CACHE_OFF is not set
 
 #
 # Processor features
@@ -237,20 +193,31 @@ CONFIG_ZONE_DMA_FLAG=0
 CONFIG_CPU_LITTLE_ENDIAN=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_SH_FPU=y
-# CONFIG_SH_DSP is not set
 CONFIG_SH_STORE_QUEUES=y
-CONFIG_SPECULATIVE_EXECUTION=y
+# CONFIG_SPECULATIVE_EXECUTION is not set
 CONFIG_CPU_HAS_INTEVT=y
-CONFIG_CPU_HAS_INTC_IRQ=y
 CONFIG_CPU_HAS_SR_RB=y
+CONFIG_CPU_HAS_FPU=y
+
+#
+# Board support
+#
+# CONFIG_SH_7780_SOLUTION_ENGINE is not set
+CONFIG_SH_SDK7780=y
+# CONFIG_SH_HIGHLANDER is not set
+# CONFIG_SH_SDK7780_STANDALONE is not set
+CONFIG_SH_SDK7780_BASE=y
 
 #
 # Timer and clock configuration
 #
 CONFIG_SH_TMU=y
 CONFIG_SH_TIMER_IRQ=28
-CONFIG_NO_IDLE_HZ=y
-CONFIG_SH_PCLK_FREQ=32000000
+CONFIG_SH_PCLK_FREQ=33333333
+CONFIG_TICK_ONESHOT=y
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 
 #
 # CPU Frequency scaling
@@ -260,18 +227,20 @@ CONFIG_SH_PCLK_FREQ=32000000
 #
 # DMA support
 #
-# CONFIG_SH_DMA is not set
+CONFIG_SH_DMA_API=y
+CONFIG_SH_DMA=y
+CONFIG_NR_ONCHIP_DMA_CHANNELS=12
+# CONFIG_NR_DMA_CHANNELS_BOOL is not set
 
 #
 # Companion Chips
 #
-# CONFIG_HD6446X_SERIES is not set
 
 #
 # Additional SuperH Device Drivers
 #
-# CONFIG_HEARTBEAT is not set
-CONFIG_PUSH_SWITCH=y
+CONFIG_HEARTBEAT=y
+# CONFIG_PUSH_SWITCH is not set
 
 #
 # Kernel features
@@ -281,22 +250,21 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
-CONFIG_KEXEC=y
+# CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
-# CONFIG_SMP is not set
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_BKL=y
+CONFIG_GUSA=y
 
 #
 # Boot options
 #
 CONFIG_ZERO_PAGE_OFFSET=0x00001000
-CONFIG_BOOT_LINK_OFFSET=0x00800000
-# CONFIG_UBC_WAKEUP is not set
+CONFIG_BOOT_LINK_OFFSET=0x01800000
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="mem=128M console=ttySC0,115200 root=/dev/sda1"
+CONFIG_CMDLINE="mem=128M console=tty0 console=ttySC0,115200 ip=bootp root=/dev/nfs nfsroot=192.168.0.1:/home/rootfs"
 
 #
 # Bus options
@@ -305,31 +273,40 @@ CONFIG_PCI=y
 CONFIG_SH_PCIDMA_NONCOHERENT=y
 CONFIG_PCI_AUTO=y
 CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
-# CONFIG_PCI_DEBUG is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-# CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCI_LEGACY is not set
+CONFIG_PCI_DEBUG=y
+CONFIG_PCCARD=y
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=y
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+# CONFIG_PD6729 is not set
+# CONFIG_I82092 is not set
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_FAKE is not set
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
 
 #
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
 # CONFIG_BINFMT_MISC is not set
 
 #
-# Power management options (EXPERIMENTAL)
-#
-# CONFIG_PM is not set
-
-#
 # Networking
 #
 CONFIG_NET=y
@@ -337,7 +314,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -347,7 +323,7 @@ CONFIG_XFRM=y
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_IP_FIB_TRIE is not set
@@ -356,52 +332,55 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_ROUTE_MULTIPATH is not set
 # CONFIG_IP_ROUTE_VERBOSE is not set
 CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
 # CONFIG_ARPD is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
-CONFIG_BRIDGE=m
+# CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
-CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
@@ -409,11 +388,39 @@ CONFIG_LLC=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+# CONFIG_NET_SCH_CBQ is not set
+# CONFIG_NET_SCH_HTB is not set
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_RR is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_DSMARK is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_INGRESS is not set
 
 #
-# QoS and/or fair queueing
+# Classification
 #
-# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_BASIC is not set
+# CONFIG_NET_CLS_TCINDEX is not set
+# CONFIG_NET_CLS_ROUTE4 is not set
+# CONFIG_NET_CLS_FW is not set
+# CONFIG_NET_CLS_U32 is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_POLICE is not set
+CONFIG_NET_SCH_FIFO=y
 
 #
 # Network testing
@@ -422,8 +429,17 @@ CONFIG_LLC=m
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
-CONFIG_WIRELESS_EXT=y
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -432,69 +448,108 @@ CONFIG_WIRELESS_EXT=y
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
+CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
-# CONFIG_BLK_CPQ_DA is not set
+CONFIG_PARPORT=y
+# CONFIG_PARPORT_PC is not set
+# CONFIG_PARPORT_GSC is not set
+# CONFIG_PARPORT_AX88796 is not set
+# CONFIG_PARPORT_1284 is not set
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_DELKIN is not set
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_PLATFORM=y
+
+#
+# PCI IDE chipsets support
+#
+CONFIG_BLK_DEV_IDEPCI=y
+# CONFIG_IDEPCI_SHARE_IRQ is not set
+CONFIG_IDEPCI_PCIBUS_ORDER=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set
+# CONFIG_BLK_DEV_HD is not set
 
 #
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -503,8 +558,9 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CHR_DEV_OSST is not set
-# CONFIG_BLK_DEV_SR is not set
-CONFIG_CHR_DEV_SG=m
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
 # CONFIG_CHR_DEV_SCH is not set
 
 #
@@ -514,19 +570,17 @@ CONFIG_CHR_DEV_SG=m
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
 #
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=y
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -536,7 +590,6 @@ CONFIG_CHR_DEV_SG=m
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
@@ -559,10 +612,7 @@ CONFIG_CHR_DEV_SG=m
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
@@ -574,7 +624,7 @@ CONFIG_ATA=y
 # CONFIG_SATA_QSTOR is not set
 # CONFIG_SATA_PROMISE is not set
 # CONFIG_SATA_SX4 is not set
-CONFIG_SATA_SIL=y
+# CONFIG_SATA_SIL is not set
 # CONFIG_SATA_SIL24 is not set
 # CONFIG_SATA_SIS is not set
 # CONFIG_SATA_ULI is not set
@@ -585,6 +635,7 @@ CONFIG_SATA_SIL=y
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -604,8 +655,10 @@ CONFIG_SATA_SIL=y
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_NETCELL is not set
 # CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
 # CONFIG_PATA_OPTI is not set
 # CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PCMCIA is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_RADISYS is not set
 # CONFIG_PATA_RZ1000 is not set
@@ -616,185 +669,87 @@ CONFIG_SATA_SIL=y
 # CONFIG_PATA_SIS is not set
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
-CONFIG_PATA_PLATFORM=y
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
+# CONFIG_PATA_PLATFORM is not set
+CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+# CONFIG_DM_CRYPT is not set
+# CONFIG_DM_SNAPSHOT is not set
+# CONFIG_DM_MIRROR is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_UEVENT is not set
 # CONFIG_FUSION is not set
-# CONFIG_FUSION_SPI is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION_SAS is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
+# CONFIG_VETH is not set
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+# CONFIG_AX88796 is not set
 # CONFIG_STNIC is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_SMC91X is not set
-
-#
-# Tulip family network device support
-#
+CONFIG_SMC91X=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-# CONFIG_PCNET32_NAPI is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_NET_PCI is not set
 # CONFIG_B44 is not set
-# CONFIG_FORCEDETH is not set
-# CONFIG_DGRS is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_E100 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-# CONFIG_VIA_RHINE_NAPI is not set
-# CONFIG_SC92031 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-CONFIG_R8169=y
-# CONFIG_R8169_NAPI is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NETXEN_NIC is not set
-
-#
-# Token Ring devices
-#
+# CONFIG_NET_POCKET is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-CONFIG_HERMES=m
-# CONFIG_PLX_HERMES is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_ATMEL is not set
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+# Wireless LAN
 #
-CONFIG_PRISM54=m
-# CONFIG_HOSTAP is not set
-CONFIG_NET_WIRELESS=y
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_NET_PCMCIA is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
+CONFIG_NETCONSOLE=y
+# CONFIG_NETCONSOLE_DYNAMIC is not set
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -802,17 +757,17 @@ CONFIG_NET_WIRELESS=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
 #
 CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 
 #
@@ -825,8 +780,19 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -836,6 +802,7 @@ CONFIG_KEYBOARD_ATKBD=y
 CONFIG_SERIO=y
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_PARKBD is not set
 # CONFIG_SERIO_PCIPS2 is not set
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
@@ -844,7 +811,10 @@ CONFIG_SERIO_LIBPS2=y
 #
 # Character devices
 #
-# CONFIG_VT is not set
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -864,32 +834,22 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
+# CONFIG_PRINTER is not set
+# CONFIG_PPDEV is not set
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-# CONFIG_DRM is not set
-# CONFIG_RAW_DRIVER is not set
 
 #
-# TPM devices
+# PCMCIA character devices
 #
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -897,22 +857,27 @@ CONFIG_HW_RANDOM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_HWMON is not set
+# CONFIG_WATCHDOG is not set
 
 #
-# Hardware Monitoring support
+# Sonics Silicon Backplane
 #
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+# CONFIG_SSB_PCMCIAHOST is not set
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
 
 #
 # Multifunction device drivers
@@ -923,22 +888,93 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Digital Video Broadcasting Devices
+# Display device support
 #
-# CONFIG_DVB is not set
+CONFIG_DISPLAY_SUPPORT=y
 
 #
-# Graphics support
+# Display hardware drivers
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_LOGO_SUPERH_MONO=y
+CONFIG_LOGO_SUPERH_VGA16=y
+CONFIG_LOGO_SUPERH_CLUT224=y
 
 #
 # Sound
 #
-CONFIG_SOUND=m
+CONFIG_SOUND=y
 
 #
 # Advanced Linux Sound Architecture
@@ -948,126 +984,162 @@ CONFIG_SOUND=m
 #
 # Open Sound System
 #
-CONFIG_SOUND_PRIME=m
-# CONFIG_OBSOLETE_OSS is not set
-# CONFIG_SOUND_BT878 is not set
-# CONFIG_SOUND_ICH is not set
+CONFIG_SOUND_PRIME=y
 # CONFIG_SOUND_TRIDENT is not set
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
-# CONFIG_SOUND_VIA82CXXX is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
 
 #
-# USB support
+# USB Input Devices
 #
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
+CONFIG_USB=y
+CONFIG_USB_DEBUG=y
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# Miscellaneous USB options
 #
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
 
 #
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
-# LED devices
+# USB Host Controller Drivers
 #
-# CONFIG_NEW_LEDS is not set
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
-# LED drivers
+# USB Device Class drivers
 #
+# CONFIG_USB_ACM is not set
+CONFIG_USB_PRINTER=y
 
 #
-# LED Triggers
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 
 #
-# InfiniBand support
+# may also be needed; see USB_STORAGE Help for more information
 #
-# CONFIG_INFINIBAND is not set
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# USB Imaging devices
 #
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+CONFIG_USB_MON=y
 
 #
-# Real Time Clock
+# USB port drivers
 #
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
+# CONFIG_USB_USS720 is not set
 
 #
-# RTC interfaces
+# USB Serial Converter support
 #
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_USB_SERIAL is not set
 
 #
-# RTC drivers
+# USB Miscellaneous drivers
 #
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_SH=y
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 
 #
-# DMA Engine support
+# USB DSL modem support
 #
-# CONFIG_DMA_ENGINE is not set
 
 #
-# DMA Clients
+# USB Gadget Support
 #
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
 
 #
-# DMA Devices
+# LED drivers
 #
 
 #
-# Auxiliary Display support
+# LED Triggers
 #
+# CONFIG_LEDS_TRIGGERS is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_AUXDISPLAY is not set
 
 #
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
 #
 CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+# CONFIG_EXT2_FS_SECURITY is not set
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
+CONFIG_EXT3_FS_POSIX_ACL=y
 # CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
@@ -1082,13 +1154,16 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-CONFIG_FUSE_FS=m
+CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
+CONFIG_GENERIC_ACL=y
 
 #
 # CD-ROM/DVD Filesystems
 #
-# CONFIG_ISO9660_FS is not set
+CONFIG_ISO9660_FS=y
+# CONFIG_JOLIET is not set
+# CONFIG_ZISOFS is not set
 # CONFIG_UDF_FS is not set
 
 #
@@ -1100,22 +1175,21 @@ CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_NTFS_FS=y
-# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_DEBUG=y
 CONFIG_NTFS_RW=y
 
 #
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
+# CONFIG_PROC_KCORE is not set
 CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -1133,19 +1207,16 @@ CONFIG_CONFIGFS_FS=m
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
+# CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFSD=y
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4 is not set
 CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
@@ -1153,25 +1224,20 @@ CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=y
@@ -1191,13 +1257,13 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_869 is not set
 # CONFIG_NLS_CODEPAGE_936 is not set
 # CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_CODEPAGE_932=y
+# CONFIG_NLS_CODEPAGE_932 is not set
 # CONFIG_NLS_CODEPAGE_949 is not set
 # CONFIG_NLS_CODEPAGE_874 is not set
 # CONFIG_NLS_ISO8859_8 is not set
 # CONFIG_NLS_CODEPAGE_1250 is not set
 # CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
@@ -1208,44 +1274,39 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_9 is not set
 # CONFIG_NLS_ISO8859_13 is not set
 # CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
+CONFIG_NLS_ISO8859_15=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# Distributed Lock Manager
-#
+CONFIG_NLS_UTF8=y
 # CONFIG_DLM is not set
-
-#
-# Profiling support
-#
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
+# CONFIG_INSTRUMENTATION is not set
 
 #
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_MAGIC_SYSRQ=y
-# CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_DEBUG_FS=y
+CONFIG_UNUSED_SYMBOLS=y
+# CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_PREEMPT is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1253,16 +1314,21 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
 # CONFIG_FRAME_POINTER is not set
-CONFIG_FORCED_INLINING=y
+# CONFIG_FORCED_INLINING is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
 CONFIG_SH_STANDARD_BIOS=y
 # CONFIG_EARLY_SCIF_CONSOLE is not set
-CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK is not set
+# CONFIG_DEBUG_BOOTMEM is not set
 CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_4KSTACKS is not set
+# CONFIG_IRQSTACKS is not set
 # CONFIG_SH_KGDB is not set
 
 #
@@ -1270,16 +1336,11 @@ CONFIG_DEBUG_STACKOVERFLOW=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_MD4 is not set
@@ -1290,10 +1351,12 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_PCBC is not set
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -1306,15 +1369,14 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
@@ -1322,7 +1384,11 @@ CONFIG_CRYPTO_DES=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig
index a5e37dbc5353..240a1cef69aa 100644
--- a/arch/sh/configs/se7712_defconfig
+++ b/arch/sh/configs/se7712_defconfig
@@ -237,7 +237,7 @@ CONFIG_CPU_HAS_SR_RB=y
 CONFIG_SH_TMU=y
 CONFIG_SH_TIMER_IRQ=16
 # CONFIG_NO_IDLE_HZ is not set
-CONFIG_SH_PCLK_FREQ=33333333
+CONFIG_SH_PCLK_FREQ=66666666
 
 #
 # CPU Frequency scaling
diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index 4e711a0c3dae..01936368b8b0 100644
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -12,7 +12,7 @@ config SH_DMA
 config NR_ONCHIP_DMA_CHANNELS
         int
         depends on SH_DMA
-        default "6" if CPU_SUBTYPE_SH7720
+        default "6" if CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721
         default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R
         default "12" if CPU_SUBTYPE_SH7780
         default "4"
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index 958bac1c585a..5c3359756a92 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -25,6 +25,7 @@ static int dmte_irq_map[] = {
         DMTE2_IRQ,
         DMTE3_IRQ,
 #if defined(CONFIG_CPU_SUBTYPE_SH7720)  ||      \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)  ||      \
     defined(CONFIG_CPU_SUBTYPE_SH7751R) ||      \
     defined(CONFIG_CPU_SUBTYPE_SH7760)  ||      \
     defined(CONFIG_CPU_SUBTYPE_SH7709)  ||      \
@@ -203,6 +204,7 @@ static int sh_dmac_get_dma_residue(struct dma_channel *chan)
 }
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721) || \
     defined(CONFIG_CPU_SUBTYPE_SH7780)
 #define dmaor_read_reg()        ctrl_inw(DMAOR)
 #define dmaor_write_reg(data)   ctrl_outw(data, DMAOR)
diff --git a/arch/sh/drivers/pci/Makefile b/arch/sh/drivers/pci/Makefile
index fba6b5ba0b3a..0718805774e8 100644
--- a/arch/sh/drivers/pci/Makefile
+++ b/arch/sh/drivers/pci/Makefile
@@ -7,16 +7,19 @@ obj-$(CONFIG_PCI_AUTO)			+= pci-auto.o
 
 obj-$(CONFIG_CPU_SUBTYPE_SH7751)        += pci-sh7751.o ops-sh4.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7751R)       += pci-sh7751.o ops-sh4.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7763)        += pci-sh7780.o ops-sh4.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7780)        += pci-sh7780.o ops-sh4.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7785)        += pci-sh7780.o ops-sh4.o
+obj-$(CONFIG_CPU_SH5)                   += pci-sh5.o ops-sh5.o
 
-obj-$(CONFIG_SH_DREAMCAST)              += ops-dreamcast.o fixups-dreamcast.o \
-                                           dma-dreamcast.o
+obj-$(CONFIG_SH_DREAMCAST)              += ops-dreamcast.o fixups-dreamcast.o
 obj-$(CONFIG_SH_SECUREEDGE5410)         += ops-snapgear.o
 obj-$(CONFIG_SH_RTS7751R2D)             += ops-rts7751r2d.o fixups-rts7751r2d.o
 obj-$(CONFIG_SH_SH03)                   += ops-sh03.o fixups-sh03.o
 obj-$(CONFIG_SH_HIGHLANDER)             += ops-r7780rp.o fixups-r7780rp.o
+obj-$(CONFIG_SH_SDK7780)                += ops-sdk7780.o fixups-sdk7780.o
 obj-$(CONFIG_SH_TITAN)                  += ops-titan.o
 obj-$(CONFIG_SH_LANDISK)                += ops-landisk.o
 obj-$(CONFIG_SH_LBOX_RE2)               += ops-lboxre2.o fixups-lboxre2.o
 obj-$(CONFIG_SH_7780_SOLUTION_ENGINE)   += ops-se7780.o fixups-se7780.o
+obj-$(CONFIG_SH_CAYMAN)                 += ops-cayman.o
diff --git a/arch/sh/drivers/pci/dma-dreamcast.c b/arch/sh/drivers/pci/dma-dreamcast.c
deleted file mode 100644
index 888a34050599..000000000000
--- a/arch/sh/drivers/pci/dma-dreamcast.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * arch/sh/drivers/pci/dma-dreamcast.c
- *
- * PCI DMA support for the Sega Dreamcast
- *
- * Copyright (C) 2001, 2002  M. R. Brown
- * Copyright (C) 2002, 2003  Paul Mundt
- *
- * This file originally bore the message (with enclosed-$):
- *      Id: pci.c,v 1.3 2003/05/04 19:29:46 lethal Exp
- *      Dreamcast PCI: Supports SEGA Broadband Adaptor only.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/param.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <linux/device.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/mach/pci.h>
-
-static int gapspci_dma_used = 0;
-
-void *dreamcast_consistent_alloc(struct device *dev, size_t size,
-                                 dma_addr_t *dma_handle, gfp_t flag)
-{
-        unsigned long buf;
-
-        if (dev && dev->bus != &pci_bus_type)
-                return NULL;
-
-        if (gapspci_dma_used + size > GAPSPCI_DMA_SIZE)
-                return ERR_PTR(-EINVAL);
-
-        buf = GAPSPCI_DMA_BASE + gapspci_dma_used;
-
-        gapspci_dma_used = PAGE_ALIGN(gapspci_dma_used+size);
-
-        *dma_handle = (dma_addr_t)buf;
-
-        buf = P2SEGADDR(buf);
-
-        /* Flush the dcache before we hand off the buffer */
-        __flush_purge_region((void *)buf, size);
-
-        return (void *)buf;
-}
-
-int dreamcast_consistent_free(struct device *dev, size_t size,
-                         void *vaddr, dma_addr_t dma_handle)
-{
-        if (dev && dev->bus != &pci_bus_type)
-                return -EINVAL;
-
-        /* XXX */
-        gapspci_dma_used = 0;
-
-        return 0;
-}
-
diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c
index 6f53f8200dc3..c44699301eeb 100644
--- a/arch/sh/drivers/pci/fixups-dreamcast.c
+++ b/arch/sh/drivers/pci/fixups-dreamcast.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -40,6 +41,15 @@ static void __init gapspci_fixup_resources(struct pci_dev *dev)
                  */
                 dev->resource[1].start  = p->io_resource->start  + 0x100;
                 dev->resource[1].end    = dev->resource[1].start + 0x200 - 1;
+                /*
+                 * Redirect dma memory allocations to special memory window.
+                 */
+                BUG_ON(!dma_declare_coherent_memory(&dev->dev,
+                                                GAPSPCI_DMA_BASE,
+                                                GAPSPCI_DMA_BASE,
+                                                GAPSPCI_DMA_SIZE,
+                                                DMA_MEMORY_MAP |
+                                                DMA_MEMORY_EXCLUSIVE));
                 break;
         default:
                 printk("PCI: Failed resource fixup\n");
diff --git a/arch/sh/drivers/pci/fixups-sdk7780.c b/arch/sh/drivers/pci/fixups-sdk7780.c
new file mode 100644
index 000000000000..2f8863099dd1
--- /dev/null
+++ b/arch/sh/drivers/pci/fixups-sdk7780.c
@@ -0,0 +1,59 @@
+/*
+ * arch/sh/drivers/pci/fixups-sdk7780.c
+ *
+ * PCI fixups for the SDK7780SE03
+ *
+ * Copyright (C) 2003  Lineo uSolutions, Inc.
+ * Copyright (C) 2004 - 2006  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/pci.h>
+#include "pci-sh4.h"
+#include <asm/io.h>
+
+int pci_fixup_pcic(void)
+{
+        ctrl_outl(0x00000001, SH7780_PCI_VCR2);
+
+        /* Enable all interrupts, so we know what to fix */
+        pci_write_reg(0x0000C3FF, SH7780_PCIIMR);
+        pci_write_reg(0x0000380F, SH7780_PCIAINTM);
+
+        /* Set up standard PCI config registers */
+        pci_write_reg(0xFB00, SH7780_PCISTATUS);
+        pci_write_reg(0x0047, SH7780_PCICMD);
+        pci_write_reg(0x00, SH7780_PCIPIF);
+        pci_write_reg(0x00, SH7780_PCISUB);
+        pci_write_reg(0x06, SH7780_PCIBCC);
+        pci_write_reg(0x1912, SH7780_PCISVID);
+        pci_write_reg(0x0001, SH7780_PCISID);
+
+        pci_write_reg(0x08000000, SH7780_PCIMBAR0);     /* PCI */
+        pci_write_reg(0x08000000, SH7780_PCILAR0);      /* SHwy */
+        pci_write_reg(0x07F00001, SH7780_PCILSR);       /* size 128M w/ MBAR */
+
+        pci_write_reg(0x00000000, SH7780_PCIMBAR1);
+        pci_write_reg(0x00000000, SH7780_PCILAR1);
+        pci_write_reg(0x00000000, SH7780_PCILSR1);
+
+        pci_write_reg(0xAB000801, SH7780_PCIIBAR);
+
+        /*
+         * Set the MBR so PCI address is one-to-one with window,
+         * meaning all calls go straight through... use ifdef to
+         * catch erroneous assumption.
+         */
+        pci_write_reg(0xFD000000 , SH7780_PCIMBR0);
+        pci_write_reg(0x00FC0000 , SH7780_PCIMBMR0);    /* 16M */
+
+        /* Set IOBR for window containing area specified in pci.h */
+        pci_write_reg(PCIBIOS_MIN_IO & ~(SH7780_PCI_IO_SIZE-1), SH7780_PCIIOBR);
+        pci_write_reg((SH7780_PCI_IO_SIZE-1) & (7 << 18), SH7780_PCIIOBMR);
+
+        pci_write_reg(0xA5000C01, SH7780_PCICR);
+
+        return 0;
+}
diff --git a/arch/sh/drivers/pci/ops-cayman.c b/arch/sh/drivers/pci/ops-cayman.c
new file mode 100644
index 000000000000..980275ffa30b
--- /dev/null
+++ b/arch/sh/drivers/pci/ops-cayman.c
@@ -0,0 +1,94 @@
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/types.h>
+#include <asm/cpu/irq.h>
+#include "pci-sh5.h"
+
+static inline u8 bridge_swizzle(u8 pin, u8 slot)
+{
+        return (((pin - 1) + slot) % 4) + 1;
+}
+
+int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+        int result = -1;
+
+        /* The complication here is that the PCI IRQ lines from the Cayman's 2
+           5V slots get into the CPU via a different path from the IRQ lines
+           from the 3 3.3V slots.  Thus, we have to detect whether the card's
+           interrupts go via the 5V or 3.3V path, i.e. the 'bridge swizzling'
+           at the point where we cross from 5V to 3.3V is not the normal case.
+
+           The added complication is that we don't know that the 5V slots are
+           always bus 2, because a card containing a PCI-PCI bridge may be
+           plugged into a 3.3V slot, and this changes the bus numbering.
+
+           Also, the Cayman has an intermediate PCI bus that goes a custom
+           expansion board header (and to the secondary bridge).  This bus has
+           never been used in practice.
+
+           The 1ary onboard PCI-PCI bridge is device 3 on bus 0
+           The 2ary onboard PCI-PCI bridge is device 0 on the 2ary bus of
+           the 1ary bridge.
+           */
+
+        struct slot_pin {
+                int slot;
+                int pin;
+        } path[4];
+        int i=0;
+
+        while (dev->bus->number > 0) {
+
+                slot = path[i].slot = PCI_SLOT(dev->devfn);
+                pin = path[i].pin = bridge_swizzle(pin, slot);
+                dev = dev->bus->self;
+                i++;
+                if (i > 3) panic("PCI path to root bus too long!\n");
+        }
+
+        slot = PCI_SLOT(dev->devfn);
+        /* This is the slot on bus 0 through which the device is eventually
+           reachable. */
+
+        /* Now work back up. */
+        if ((slot < 3) || (i == 0)) {
+                /* Bus 0 (incl. PCI-PCI bridge itself) : perform the final
+                   swizzle now. */
+                result = IRQ_INTA + bridge_swizzle(pin, slot) - 1;
+        } else {
+                i--;
+                slot = path[i].slot;
+                pin  = path[i].pin;
+                if (slot > 0) {
+                        panic("PCI expansion bus device found - not handled!\n");
+                } else {
+                        if (i > 0) {
+                                /* 5V slots */
+                                i--;
+                                slot = path[i].slot;
+                                pin  = path[i].pin;
+                                /* 'pin' was swizzled earlier wrt slot, don't do it again. */
+                                result = IRQ_P2INTA + (pin - 1);
+                        } else {
+                                /* IRQ for 2ary PCI-PCI bridge : unused */
+                                result = -1;
+                        }
+                }
+        }
+
+        return result;
+}
+
+struct pci_channel board_pci_channels[] = {
+        { &sh5_pci_ops, NULL, NULL, 0, 0xff },
+        { NULL, NULL, NULL, 0, 0 },
+};
+EXPORT_SYMBOL(board_pci_channels);
+
+int __init pcibios_init_platform(void)
+{
+        return sh5pci_init(__pa(memory_start),
+                           __pa(memory_end) - __pa(memory_start));
+}
diff --git a/arch/sh/drivers/pci/ops-r7780rp.c b/arch/sh/drivers/pci/ops-r7780rp.c
index 48fe4032ebea..5fdadaeed6fc 100644
--- a/arch/sh/drivers/pci/ops-r7780rp.c
+++ b/arch/sh/drivers/pci/ops-r7780rp.c
@@ -17,25 +17,13 @@
 #include <asm/io.h>
 #include "pci-sh4.h"
 
-static char r7780rp_irq_tab[] __initdata = {
-        0, 1, 2, 3,
-};
-
-static char r7780mp_irq_tab[] __initdata = {
+static char irq_tab[] __initdata = {
         65, 66, 67, 68,
 };
 
 int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
 {
-        if (mach_is_r7780rp())
-                return r7780rp_irq_tab[slot];
-        if (mach_is_r7780mp() || mach_is_r7785rp())
-                return r7780mp_irq_tab[slot];
-
-        printk(KERN_ERR "PCI: Bad IRQ mapping "
-               "request for slot %d, func %d\n", slot, pin-1);
-
-        return -1;
+        return irq_tab[slot];
 }
 
 static struct resource sh7780_io_resource = {
diff --git a/arch/sh/drivers/pci/ops-sdk7780.c b/arch/sh/drivers/pci/ops-sdk7780.c
new file mode 100644
index 000000000000..66a9b4047f26
--- /dev/null
+++ b/arch/sh/drivers/pci/ops-sdk7780.c
@@ -0,0 +1,73 @@
+/*
+ * linux/arch/sh/drivers/pci/ops-sdk7780.c
+ *
+ * Copyright (C) 2006  Nobuhiro Iwamatsu
+ *
+ * PCI initialization for the SDK7780SE03
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License.  See linux/COPYING for more information.
+ */
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include <asm/sdk7780.h>
+#include <asm/io.h>
+#include "pci-sh4.h"
+
+/* IDSEL [16][17][18][19][20][21][22][23][24][25][26][27][28][29][30][31] */
+static char sdk7780_irq_tab[4][16] __initdata = {
+        /* INTA */
+        { 65, 68, 67, 68, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
+        /* INTB */
+        { 66, 65, -1, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
+        /* INTC */
+        { 67, 66, -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
+        /* INTD */
+        { 68, 67, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
+};
+
+int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
+{
+       return sdk7780_irq_tab[pin-1][slot];
+}
+
+static struct resource sdk7780_io_resource = {
+        .name   = "SH7780_IO",
+        .start  = SH7780_PCI_IO_BASE,
+        .end    = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1,
+        .flags  = IORESOURCE_IO
+};
+
+static struct resource sdk7780_mem_resource = {
+        .name   = "SH7780_mem",
+        .start  = SH7780_PCI_MEMORY_BASE,
+        .end    = SH7780_PCI_MEMORY_BASE + SH7780_PCI_MEM_SIZE - 1,
+        .flags  = IORESOURCE_MEM
+};
+
+struct pci_channel board_pci_channels[] = {
+        { &sh4_pci_ops, &sdk7780_io_resource, &sdk7780_mem_resource, 0, 0xff },
+        { NULL, NULL, NULL, 0, 0 },
+};
+EXPORT_SYMBOL(board_pci_channels);
+
+static struct sh4_pci_address_map sdk7780_pci_map = {
+        .window0        = {
+                .base   = SH7780_CS2_BASE_ADDR,
+                .size   = 0x04000000,
+        },
+        .window1        = {
+                .base   = SH7780_CS3_BASE_ADDR,
+                .size   = 0x04000000,
+        },
+        .flags  = SH4_PCIC_NO_RESET,
+};
+
+int __init pcibios_init_platform(void)
+{
+        printk(KERN_INFO "SH7780 PCI: Finished initializing PCI controller\n");
+        return sh7780_pcic_init(&sdk7780_pci_map);
+}
diff --git a/arch/sh/drivers/pci/ops-sh5.c b/arch/sh/drivers/pci/ops-sh5.c
new file mode 100644
index 000000000000..729e38a6fe07
--- /dev/null
+++ b/arch/sh/drivers/pci/ops-sh5.c
@@ -0,0 +1,93 @@
+/*
+ * Support functions for the SH5 PCI hardware.
+ *
+ * Copyright (C) 2001 David J. Mckay (david.mckay@st.com)
+ * Copyright (C) 2003, 2004 Paul Mundt
+ * Copyright (C) 2004 Richard Curnow
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License.  See linux/COPYING for more information.
+ */
+#include <linux/kernel.h>
+#include <linux/rwsem.h>
+#include <linux/smp.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/types.h>
+#include <linux/irq.h>
+#include <asm/pci.h>
+#include <asm/io.h>
+#include "pci-sh5.h"
+
+static void __init pci_fixup_ide_bases(struct pci_dev *d)
+{
+        int i;
+
+        /*
+         * PCI IDE controllers use non-standard I/O port decoding, respect it.
+         */
+        if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE)
+                return;
+        printk("PCI: IDE base address fixup for %s\n", pci_name(d));
+        for(i=0; i<4; i++) {
+                struct resource *r = &d->resource[i];
+                if ((r->start & ~0x80) == 0x374) {
+                        r->start |= 2;
+                        r->end = r->start;
+                }
+        }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
+
+char * __devinit pcibios_setup(char *str)
+{
+        return str;
+}
+
+static int sh5pci_read(struct pci_bus *bus, unsigned int devfn, int where,
+                        int size, u32 *val)
+{
+        SH5PCI_WRITE(PAR, CONFIG_CMD(bus, devfn, where));
+
+        switch (size) {
+                case 1:
+                        *val = (u8)SH5PCI_READ_BYTE(PDR + (where & 3));
+                        break;
+                case 2:
+                        *val = (u16)SH5PCI_READ_SHORT(PDR + (where & 2));
+                        break;
+                case 4:
+                        *val = SH5PCI_READ(PDR);
+                        break;
+        }
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static int sh5pci_write(struct pci_bus *bus, unsigned int devfn, int where,
+                         int size, u32 val)
+{
+        SH5PCI_WRITE(PAR, CONFIG_CMD(bus, devfn, where));
+
+        switch (size) {
+                case 1:
+                        SH5PCI_WRITE_BYTE(PDR + (where & 3), (u8)val);
+                        break;
+                case 2:
+                        SH5PCI_WRITE_SHORT(PDR + (where & 2), (u16)val);
+                        break;
+                case 4:
+                        SH5PCI_WRITE(PDR, val);
+                        break;
+        }
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+struct pci_ops sh5_pci_ops = {
+        .read           = sh5pci_read,
+        .write          = sh5pci_write,
+};
diff --git a/arch/sh/drivers/pci/pci-auto.c b/arch/sh/drivers/pci/pci-auto.c
index 224e007736fb..ea404704ace8 100644
--- a/arch/sh/drivers/pci/pci-auto.c
+++ b/arch/sh/drivers/pci/pci-auto.c
@@ -516,10 +516,8 @@ pciauto_bus_scan(struct pci_channel *hose, int top_bus, int current_bus)
                                          PCI_COMMAND, cmdstat | PCI_COMMAND_IO |
                                          PCI_COMMAND_MEMORY |
                                          PCI_COMMAND_MASTER);
-#if !defined(CONFIG_SH_HS7751RVOIP) && !defined(CONFIG_SH_RTS7751R2D)
                 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
                                         PCI_LATENCY_TIMER, 0x80);
-#endif
 
                 /* Allocate PCI I/O and/or memory space */
                 pciauto_setup_bars(hose, top_bus, current_bus, pci_devfn, PCI_BASE_ADDRESS_5);
diff --git a/arch/sh/drivers/pci/pci-sh4.h b/arch/sh/drivers/pci/pci-sh4.h
index 1901c33cde6a..4925c79ea959 100644
--- a/arch/sh/drivers/pci/pci-sh4.h
+++ b/arch/sh/drivers/pci/pci-sh4.h
@@ -1,7 +1,9 @@
 #ifndef __PCI_SH4_H
 #define __PCI_SH4_H
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7780) || defined(CONFIG_CPU_SUBTYPE_SH7785)
+#if defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7785) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7763)
 #include "pci-sh7780.h"
 #else
 #include "pci-sh7751.h"
diff --git a/arch/sh/drivers/pci/pci-sh5.c b/arch/sh/drivers/pci/pci-sh5.c
new file mode 100644
index 000000000000..a00a4df8c02d
--- /dev/null
+++ b/arch/sh/drivers/pci/pci-sh5.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2001 David J. Mckay (david.mckay@st.com)
+ * Copyright (C) 2003, 2004 Paul Mundt
+ * Copyright (C) 2004 Richard Curnow
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License.  See linux/COPYING for more information.
+ *
+ * Support functions for the SH5 PCI hardware.
+ */
+
+#include <linux/kernel.h>
+#include <linux/rwsem.h>
+#include <linux/smp.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/types.h>
+#include <linux/irq.h>
+#include <asm/cpu/irq.h>
+#include <asm/pci.h>
+#include <asm/io.h>
+#include "pci-sh5.h"
+
+unsigned long pcicr_virt;
+unsigned long PCI_IO_AREA;
+
+/* Rounds a number UP to the nearest power of two. Used for
+ * sizing the PCI window.
+ */
+static u32 __init r2p2(u32 num)
+{
+        int i = 31;
+        u32 tmp = num;
+
+        if (num == 0)
+                return 0;
+
+        do {
+                if (tmp & (1 << 31))
+                        break;
+                i--;
+                tmp <<= 1;
+        } while (i >= 0);
+
+        tmp = 1 << i;
+        /* If the original number isn't a power of 2, round it up */
+        if (tmp != num)
+                tmp <<= 1;
+
+        return tmp;
+}
+
+static irqreturn_t pcish5_err_irq(int irq, void *dev_id)
+{
+        struct pt_regs *regs = get_irq_regs();
+        unsigned pci_int, pci_air, pci_cir, pci_aint;
+
+        pci_int = SH5PCI_READ(INT);
+        pci_cir = SH5PCI_READ(CIR);
+        pci_air = SH5PCI_READ(AIR);
+
+        if (pci_int) {
+                printk("PCI INTERRUPT (at %08llx)!\n", regs->pc);
+                printk("PCI INT -> 0x%x\n", pci_int & 0xffff);
+                printk("PCI AIR -> 0x%x\n", pci_air);
+                printk("PCI CIR -> 0x%x\n", pci_cir);
+                SH5PCI_WRITE(INT, ~0);
+        }
+
+        pci_aint = SH5PCI_READ(AINT);
+        if (pci_aint) {
+                printk("PCI ARB INTERRUPT!\n");
+                printk("PCI AINT -> 0x%x\n", pci_aint);
+                printk("PCI AIR -> 0x%x\n", pci_air);
+                printk("PCI CIR -> 0x%x\n", pci_cir);
+                SH5PCI_WRITE(AINT, ~0);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t pcish5_serr_irq(int irq, void *dev_id)
+{
+        printk("SERR IRQ\n");
+
+        return IRQ_NONE;
+}
+
+int __init sh5pci_init(unsigned long memStart, unsigned long memSize)
+{
+        u32 lsr0;
+        u32 uval;
+
+        if (request_irq(IRQ_ERR, pcish5_err_irq,
+                        IRQF_DISABLED, "PCI Error",NULL) < 0) {
+                printk(KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n");
+                return -EINVAL;
+        }
+
+        if (request_irq(IRQ_SERR, pcish5_serr_irq,
+                        IRQF_DISABLED, "PCI SERR interrupt", NULL) < 0) {
+                printk(KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n");
+                return -EINVAL;
+        }
+
+        pcicr_virt = onchip_remap(SH5PCI_ICR_BASE, 1024, "PCICR");
+        if (!pcicr_virt) {
+                panic("Unable to remap PCICR\n");
+        }
+
+        PCI_IO_AREA = onchip_remap(SH5PCI_IO_BASE, 0x10000, "PCIIO");
+        if (!PCI_IO_AREA) {
+                panic("Unable to remap PCIIO\n");
+        }
+
+        /* Clear snoop registers */
+        SH5PCI_WRITE(CSCR0, 0);
+        SH5PCI_WRITE(CSCR1, 0);
+
+        /* Switch off interrupts */
+        SH5PCI_WRITE(INTM,  0);
+        SH5PCI_WRITE(AINTM, 0);
+        SH5PCI_WRITE(PINTM, 0);
+
+        /* Set bus active, take it out of reset */
+        uval = SH5PCI_READ(CR);
+
+        /* Set command Register */
+        SH5PCI_WRITE(CR, uval | CR_LOCK_MASK | CR_CFINT| CR_FTO | CR_PFE |
+                     CR_PFCS | CR_BMAM);
+
+        uval=SH5PCI_READ(CR);
+
+        /* Allow it to be a master */
+        /* NB - WE DISABLE I/O ACCESS to stop overlap */
+        /* set WAIT bit to enable stepping, an attempt to improve stability */
+        SH5PCI_WRITE_SHORT(CSR_CMD,
+                            PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
+                            PCI_COMMAND_WAIT);
+
+        /*
+        ** Set translation mapping memory in order to convert the address
+        ** used for the main bus, to the PCI internal address.
+        */
+        SH5PCI_WRITE(MBR,0x40000000);
+
+        /* Always set the max size 512M */
+        SH5PCI_WRITE(MBMR, PCISH5_MEM_SIZCONV(512*1024*1024));
+
+        /*
+        ** I/O addresses are mapped at internal PCI specific address
+        ** as is described into the configuration bridge table.
+        ** These are changed to 0, to allow cards that have legacy
+        ** io such as vga to function correctly. We set the SH5 IOBAR to
+        ** 256K, which is a bit big as we can only have 64K of address space
+        */
+
+        SH5PCI_WRITE(IOBR,0x0);
+
+        /* Set up a 256K window. Totally pointless waste  of address space */
+        SH5PCI_WRITE(IOBMR,0);
+
+        /* The SH5 has a HUGE 256K I/O region, which breaks the PCI spec.
+         * Ideally, we would want to map the I/O region somewhere, but it
+         * is so big this is not that easy!
+         */
+        SH5PCI_WRITE(CSR_IBAR0,~0);
+        /* Set memory size value */
+        memSize = memory_end - memory_start;
+
+        /* Now we set up the mbars so the PCI bus can see the memory of
+         * the machine */
+        if (memSize < (1024 * 1024)) {
+                printk(KERN_ERR "PCISH5: Ridiculous memory size of 0x%lx?\n",
+                       memSize);
+                return -EINVAL;
+        }
+
+        /* Set LSR 0 */
+        lsr0 = (memSize > (512 * 1024 * 1024)) ? 0x1ff00001 :
+                ((r2p2(memSize) - 0x100000) | 0x1);
+        SH5PCI_WRITE(LSR0, lsr0);
+
+        /* Set MBAR 0 */
+        SH5PCI_WRITE(CSR_MBAR0, memory_start);
+        SH5PCI_WRITE(LAR0, memory_start);
+
+        SH5PCI_WRITE(CSR_MBAR1,0);
+        SH5PCI_WRITE(LAR1,0);
+        SH5PCI_WRITE(LSR1,0);
+
+        /* Enable the PCI interrupts on the device */
+        SH5PCI_WRITE(INTM,  ~0);
+        SH5PCI_WRITE(AINTM, ~0);
+        SH5PCI_WRITE(PINTM, ~0);
+
+        return 0;
+}
+
+void __devinit pcibios_fixup_bus(struct pci_bus *bus)
+{
+        struct pci_dev *dev = bus->self;
+        int i;
+
+        if (dev) {
+                for (i= 0; i < 3; i++) {
+                        bus->resource[i] =
+                                &dev->resource[PCI_BRIDGE_RESOURCES+i];
+                        bus->resource[i]->name = bus->name;
+                }
+                bus->resource[0]->flags |= IORESOURCE_IO;
+                bus->resource[1]->flags |= IORESOURCE_MEM;
+
+                /* For now, propagate host limits to the bus;
+                 * we'll adjust them later. */
+                bus->resource[0]->end = 64*1024 - 1 ;
+                bus->resource[1]->end = PCIBIOS_MIN_MEM+(256*1024*1024)-1;
+                bus->resource[0]->start = PCIBIOS_MIN_IO;
+                bus->resource[1]->start = PCIBIOS_MIN_MEM;
+
+                /* Turn off downstream PF memory address range by default */
+                bus->resource[2]->start = 1024*1024;
+                bus->resource[2]->end = bus->resource[2]->start - 1;
+        }
+}
diff --git a/arch/sh64/kernel/pci_sh5.h b/arch/sh/drivers/pci/pci-sh5.h
index c71159dd04b9..7cff3fc04d30 100644
--- a/arch/sh64/kernel/pci_sh5.h
+++ b/arch/sh/drivers/pci/pci-sh5.h
@@ -6,6 +6,8 @@
  *
  * Definitions for the SH5 PCI hardware.
  */
+#ifndef __PCI_SH5_H
+#define __PCI_SH5_H
 
 /* Product ID */
 #define PCISH5_PID              0x350d
@@ -73,13 +75,12 @@
 #define PCISH5_ICR_CSR_MBAR0   0x014   /* First  Memory base address register */
 #define PCISH5_ICR_CSR_MBAR1   0x018   /* Second Memory base address register */
 
-
-
 /* Base address of registers */
 #define SH5PCI_ICR_BASE (PHYS_PCI_BLOCK + 0x00040000)
 #define SH5PCI_IO_BASE  (PHYS_PCI_BLOCK + 0x00800000)
 /* #define SH5PCI_VCR_BASE (P2SEG_PCICB_BLOCK + P2SEG)    */
 
+extern unsigned long pcicr_virt;
 /* Register selection macro */
 #define PCISH5_ICR_REG(x)                ( pcicr_virt + (PCISH5_ICR_##x))
 /* #define PCISH5_VCR_REG(x)                ( SH5PCI_VCR_BASE (PCISH5_VCR_##x)) */
@@ -104,4 +105,9 @@
 #define PCISH5_MEM_SIZCONV(x)             (((x / 0x40000) - 1) << 18)
 #define PCISH5_IO_SIZCONV(x)              (((x / 0x40000) - 1) << 18)
 
+extern struct pci_ops sh5_pci_ops;
+
+/* arch/sh/drivers/pci/pci-sh5.c */
+int sh5pci_init(unsigned long memStart, unsigned long memSize);
 
+#endif /* __PCI_SH5_H */
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index e516087fb435..7d797f4de5e7 100644
--- a/arch/sh/drivers/pci/pci-sh7780.c
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -58,6 +58,7 @@ static int __init sh7780_pci_init(void)
         id = pci_read_reg(SH7780_PCIVID);
         if ((id & 0xffff) == SH7780_VENDOR_ID) {
                 switch ((id >> 16) & 0xffff) {
+                case SH7763_DEVICE_ID:
                 case SH7780_DEVICE_ID:
                 case SH7781_DEVICE_ID:
                 case SH7785_DEVICE_ID:
diff --git a/arch/sh/drivers/pci/pci-sh7780.h b/arch/sh/drivers/pci/pci-sh7780.h
index 1d069a859de2..97b2c98f05c4 100644
--- a/arch/sh/drivers/pci/pci-sh7780.h
+++ b/arch/sh/drivers/pci/pci-sh7780.h
@@ -16,6 +16,7 @@
 #define SH7780_VENDOR_ID        0x1912
 #define SH7781_DEVICE_ID        0x0001
 #define SH7780_DEVICE_ID        0x0002
+#define SH7763_DEVICE_ID        0x0004
 #define SH7785_DEVICE_ID        0x0007
 
 /* SH7780 Control Registers */
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index ccaba368ac9b..49b435c3a57a 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -71,7 +71,7 @@ subsys_initcall(pcibios_init);
  *  Called after each bus is probed, but before its children
  *  are examined.
  */
-void __devinit pcibios_fixup_bus(struct pci_bus *bus)
+void __devinit __weak pcibios_fixup_bus(struct pci_bus *bus)
 {
         pci_read_bridge_bases(bus);
 }
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index 4b81d9c47b00..349d833deab5 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -1,25 +1,5 @@
-#
-# Makefile for the Linux/SuperH kernel.
-#
-
-extra-y := head.o init_task.o vmlinux.lds
-
-obj-y   := debugtraps.o io.o io_generic.o irq.o machvec.o process.o ptrace.o \
-           semaphore.o setup.o signal.o sys_sh.o syscalls.o \
-           time.o topology.o traps.o
-
-obj-y                           += cpu/ timers/
-obj-$(CONFIG_VSYSCALL)          += vsyscall/
-obj-$(CONFIG_SMP)               += smp.o
-obj-$(CONFIG_CF_ENABLER)        += cf-enabler.o
-obj-$(CONFIG_SH_STANDARD_BIOS)  += sh_bios.o
-obj-$(CONFIG_SH_KGDB)           += kgdb_stub.o kgdb_jmp.o
-obj-$(CONFIG_SH_CPU_FREQ)       += cpufreq.o
-obj-$(CONFIG_MODULES)           += sh_ksyms.o module.o
-obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
-obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
-obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
-obj-$(CONFIG_PM)                += pm.o
-obj-$(CONFIG_STACKTRACE)        += stacktrace.o
-
-EXTRA_CFLAGS += -Werror
+ifeq ($(CONFIG_SUPERH32),y)
+include ${srctree}/arch/sh/kernel/Makefile_32
+else
+include ${srctree}/arch/sh/kernel/Makefile_64
+endif
diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32
new file mode 100644
index 000000000000..c89289831053
--- /dev/null
+++ b/arch/sh/kernel/Makefile_32
@@ -0,0 +1,26 @@
+#
+# Makefile for the Linux/SuperH kernel.
+#
+
+extra-y := head_32.o init_task.o vmlinux.lds
+
+obj-y   := debugtraps.o io.o io_generic.o irq.o machvec.o process_32.o \
+           ptrace_32.o semaphore.o setup.o signal_32.o sys_sh.o sys_sh32.o \
+           syscalls_32.o time_32.o topology.o traps.o traps_32.o
+
+obj-y                           += cpu/ timers/
+obj-$(CONFIG_VSYSCALL)          += vsyscall/
+obj-$(CONFIG_SMP)               += smp.o
+obj-$(CONFIG_CF_ENABLER)        += cf-enabler.o
+obj-$(CONFIG_SH_STANDARD_BIOS)  += sh_bios.o
+obj-$(CONFIG_SH_KGDB)           += kgdb_stub.o kgdb_jmp.o
+obj-$(CONFIG_SH_CPU_FREQ)       += cpufreq.o
+obj-$(CONFIG_MODULES)           += sh_ksyms_32.o module.o
+obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
+obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
+obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
+obj-$(CONFIG_PM)                += pm.o
+obj-$(CONFIG_STACKTRACE)        += stacktrace.o
+obj-$(CONFIG_BINFMT_ELF)        += dump_task.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/sh/kernel/Makefile_64 b/arch/sh/kernel/Makefile_64
new file mode 100644
index 000000000000..1ef21cc087f3
--- /dev/null
+++ b/arch/sh/kernel/Makefile_64
@@ -0,0 +1,22 @@
+extra-y := head_64.o init_task.o vmlinux.lds
+
+obj-y   := debugtraps.o io.o io_generic.o irq.o machvec.o process_64.o \
+           ptrace_64.o semaphore.o setup.o signal_64.o sys_sh.o sys_sh64.o \
+           syscalls_64.o time_64.o topology.o traps.o traps_64.o
+
+obj-y                           += cpu/ timers/
+obj-$(CONFIG_VSYSCALL)          += vsyscall/
+obj-$(CONFIG_SMP)               += smp.o
+obj-$(CONFIG_CF_ENABLER)        += cf-enabler.o
+obj-$(CONFIG_SH_STANDARD_BIOS)  += sh_bios.o
+obj-$(CONFIG_SH_KGDB)           += kgdb_stub.o kgdb_jmp.o
+obj-$(CONFIG_SH_CPU_FREQ)       += cpufreq.o
+obj-$(CONFIG_MODULES)           += sh_ksyms_64.o module.o
+obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
+obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
+obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
+obj-$(CONFIG_PM)                += pm.o
+obj-$(CONFIG_STACKTRACE)        += stacktrace.o
+obj-$(CONFIG_BINFMT_ELF)        += dump_task.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile
index d055a3ea6b4b..f471d242774e 100644
--- a/arch/sh/kernel/cpu/Makefile
+++ b/arch/sh/kernel/cpu/Makefile
@@ -6,8 +6,14 @@ obj-$(CONFIG_CPU_SH2)		= sh2/
 obj-$(CONFIG_CPU_SH2A)          = sh2a/
 obj-$(CONFIG_CPU_SH3)           = sh3/
 obj-$(CONFIG_CPU_SH4)           = sh4/
+obj-$(CONFIG_CPU_SH5)           = sh5/
+
+# Special cases for family ancestry.
+
 obj-$(CONFIG_CPU_SH4A)          += sh4a/
 
+# Common interfaces.
+
 obj-$(CONFIG_UBC_WAKEUP)        += ubc.o
 obj-$(CONFIG_SH_ADC)            += adc.o
 
diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index c217c4bf0085..80a31329ead9 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/log2.h>
 #include <asm/mmu_context.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
@@ -20,9 +21,12 @@
 #include <asm/system.h>
 #include <asm/cacheflush.h>
 #include <asm/cache.h>
+#include <asm/elf.h>
 #include <asm/io.h>
-#include <asm/ubc.h>
 #include <asm/smp.h>
+#ifdef CONFIG_SUPERH32
+#include <asm/ubc.h>
+#endif
 
 /*
  * Generic wrapper for command line arguments to disable on-chip
@@ -61,25 +65,12 @@ static void __init speculative_execution_init(void)
 /*
  * Generic first-level cache init
  */
-static void __init cache_init(void)
+#ifdef CONFIG_SUPERH32
+static void __uses_jump_to_uncached cache_init(void)
 {
         unsigned long ccr, flags;
 
-        /* First setup the rest of the I-cache info */
-        current_cpu_data.icache.entry_mask = current_cpu_data.icache.way_incr -
-                                      current_cpu_data.icache.linesz;
-
-        current_cpu_data.icache.way_size = current_cpu_data.icache.sets *
-                                    current_cpu_data.icache.linesz;
-
-        /* And the D-cache too */
-        current_cpu_data.dcache.entry_mask = current_cpu_data.dcache.way_incr -
-                                      current_cpu_data.dcache.linesz;
-
-        current_cpu_data.dcache.way_size = current_cpu_data.dcache.sets *
-                                    current_cpu_data.dcache.linesz;
-
-        jump_to_P2();
+        jump_to_uncached();
         ccr = ctrl_inl(CCR);
 
         /*
@@ -156,7 +147,31 @@ static void __init cache_init(void)
 #endif
 
         ctrl_outl(flags, CCR);
-        back_to_P1();
+        back_to_cached();
+}
+#else
+#define cache_init()    do { } while (0)
+#endif
+
+#define CSHAPE(totalsize, linesize, assoc) \
+        ((totalsize & ~0xff) | (linesize << 4) | assoc)
+
+#define CACHE_DESC_SHAPE(desc)  \
+        CSHAPE((desc).way_size * (desc).ways, ilog2((desc).linesz), (desc).ways)
+
+static void detect_cache_shape(void)
+{
+        l1d_cache_shape = CACHE_DESC_SHAPE(current_cpu_data.dcache);
+
+        if (current_cpu_data.dcache.flags & SH_CACHE_COMBINED)
+                l1i_cache_shape = l1d_cache_shape;
+        else
+                l1i_cache_shape = CACHE_DESC_SHAPE(current_cpu_data.icache);
+
+        if (current_cpu_data.flags & CPU_HAS_L2_CACHE)
+                l2_cache_shape = CACHE_DESC_SHAPE(current_cpu_data.scache);
+        else
+                l2_cache_shape = -1; /* No S-cache */
 }
 
 #ifdef CONFIG_SH_DSP
@@ -228,14 +243,32 @@ asmlinkage void __cpuinit sh_cpu_init(void)
         if (current_cpu_data.type == CPU_SH_NONE)
                 panic("Unknown CPU");
 
+        /* First setup the rest of the I-cache info */
+        current_cpu_data.icache.entry_mask = current_cpu_data.icache.way_incr -
+                                      current_cpu_data.icache.linesz;
+
+        current_cpu_data.icache.way_size = current_cpu_data.icache.sets *
+                                    current_cpu_data.icache.linesz;
+
+        /* And the D-cache too */
+        current_cpu_data.dcache.entry_mask = current_cpu_data.dcache.way_incr -
+                                      current_cpu_data.dcache.linesz;
+
+        current_cpu_data.dcache.way_size = current_cpu_data.dcache.sets *
+                                    current_cpu_data.dcache.linesz;
+
         /* Init the cache */
         cache_init();
 
-        if (raw_smp_processor_id() == 0)
+        if (raw_smp_processor_id() == 0) {
                 shm_align_mask = max_t(unsigned long,
                                        current_cpu_data.dcache.way_size - 1,
                                        PAGE_SIZE - 1);
 
+                /* Boot CPU sets the cache shape */
+                detect_cache_shape();
+        }
+
         /* Disable the FPU */
         if (fpu_disabled) {
                 printk("FPU Disabled\n");
@@ -273,7 +306,10 @@ asmlinkage void __cpuinit sh_cpu_init(void)
          * like PTRACE_SINGLESTEP or doing hardware watchpoints in GDB.  So ..
          * we wake it up and hope that all is well.
          */
+#ifdef CONFIG_SUPERH32
         if (raw_smp_processor_id() == 0)
                 ubc_wakeup();
+#endif
+
         speculative_execution_init();
 }
diff --git a/arch/sh/kernel/cpu/irq/Makefile b/arch/sh/kernel/cpu/irq/Makefile
index 8da8e178f09c..cc1836e47a5d 100644
--- a/arch/sh/kernel/cpu/irq/Makefile
+++ b/arch/sh/kernel/cpu/irq/Makefile
@@ -1,7 +1,9 @@
 #
 # Makefile for the Linux/SuperH CPU-specifc IRQ handlers.
 #
-obj-y   += imask.o intc.o
+obj-y   += intc.o
 
+obj-$(CONFIG_SUPERH32)                  += imask.o
+obj-$(CONFIG_CPU_SH5)                   += intc-sh5.o
 obj-$(CONFIG_CPU_HAS_IPR_IRQ)           += ipr.o
 obj-$(CONFIG_CPU_HAS_MASKREG_IRQ)       += maskreg.o
diff --git a/arch/sh64/kernel/irq_intc.c b/arch/sh/kernel/cpu/irq/intc-sh5.c
index 3b63a93198f2..43ee7a9a4f0b 100644
--- a/arch/sh64/kernel/irq_intc.c
+++ b/arch/sh/kernel/cpu/irq/intc-sh5.c
@@ -1,34 +1,27 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
+ * arch/sh/kernel/cpu/irq/intc-sh5.c
  *
- * arch/sh64/kernel/irq_intc.c
+ * Interrupt Controller support for SH5 INTC.
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003  Paul Mundt
  *
- * Interrupt Controller support for SH5 INTC.
  * Per-interrupt selective. IRLM=0 (Fixed priority) is not
  * supported being useless without a cascaded interrupt
  * controller.
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/stddef.h>
-#include <linux/bitops.h>       /* this includes also <asm/registers.h */
-                                /* which is required to remap register */
-                                /* names used into __asm__ blocks...   */
-
-#include <asm/hardware.h>
-#include <asm/platform.h>
+#include <linux/bitops.h>
+#include <asm/cpu/irq.h>
 #include <asm/page.h>
-#include <asm/io.h>
-#include <asm/irq.h>
 
 /*
  * Maybe the generic Peripheral block could move to a more
@@ -192,7 +185,7 @@ int intc_irq_describe(char* p, int irq)
 }
 #endif
 
-void __init init_IRQ(void)
+void __init plat_irq_setup(void)
 {
         unsigned long long __dummy0, __dummy1=~0x00000000100000f0;
         unsigned long reg;
@@ -251,14 +244,6 @@ void __init init_IRQ(void)
                 }
         }
 
-#ifdef CONFIG_SH_CAYMAN
-        {
-                extern void init_cayman_irq(void);
-
-                init_cayman_irq();
-        }
-#endif
-
         /*
          * And now let interrupts come in.
          * sti() is not enough, we need to
diff --git a/arch/sh/kernel/cpu/irq/intc.c b/arch/sh/kernel/cpu/irq/intc.c
index 6ac018c15e03..84806b2027f8 100644
--- a/arch/sh/kernel/cpu/irq/intc.c
+++ b/arch/sh/kernel/cpu/irq/intc.c
@@ -335,31 +335,6 @@ static intc_enum __init intc_grp_id(struct intc_desc *desc,
         return 0;
 }
 
-static unsigned int __init intc_prio_value(struct intc_desc *desc,
-                                           intc_enum enum_id, int do_grps)
-{
-        struct intc_prio *p = desc->priorities;
-        unsigned int i;
-
-        for (i = 0; p && enum_id && i < desc->nr_priorities; i++) {
-                p = desc->priorities + i;
-
-                if (p->enum_id != enum_id)
-                        continue;
-
-                return p->priority;
-        }
-
-        if (do_grps)
-                return intc_prio_value(desc, intc_grp_id(desc, enum_id), 0);
-
-        /* default to the lowest priority possible if no priority is set
-         * - this needs to be at least 2 for 5-bit priorities on 7780
-         */
-
-        return 2;
-}
-
 static unsigned int __init intc_mask_data(struct intc_desc *desc,
                                           struct intc_desc_int *d,
                                           intc_enum enum_id, int do_grps)
@@ -518,8 +493,10 @@ static void __init intc_register_irq(struct intc_desc *desc,
                                       handle_level_irq, "level");
         set_irq_chip_data(irq, (void *)data[primary]);
 
-        /* record the desired priority level */
-        intc_prio_level[irq] = intc_prio_value(desc, enum_id, 1);
+        /* set priority level
+         * - this needs to be at least 2 for 5-bit priorities on 7780
+         */
+        intc_prio_level[irq] = 2;
 
         /* enable secondary masking method if present */
         if (data[!primary])
diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S
index ee8f1fe84b08..7a26569e7956 100644
--- a/arch/sh/kernel/cpu/sh2/entry.S
+++ b/arch/sh/kernel/cpu/sh2/entry.S
@@ -149,6 +149,14 @@ ENTRY(exception_handler)
         mov     #32,r8
         cmp/hs  r8,r9
         bt      trap_entry      ! 64 > vec >= 32  is trap
+
+#if defined(CONFIG_SH_FPU)
+        mov     #13,r8
+        cmp/eq  r8,r9
+        bt      10f             ! fpu
+        nop
+#endif
+
         mov.l   4f,r8
         mov     r9,r4
         shll2   r9
@@ -158,6 +166,10 @@ ENTRY(exception_handler)
         cmp/eq  r9,r8
         bf      3f
         mov.l   8f,r8           ! unhandled exception
+#if defined(CONFIG_SH_FPU)
+10:
+        mov.l   9f, r8          ! unhandled exception
+#endif
 3:
         mov.l   5f,r10
         jmp     @r8
@@ -177,7 +189,10 @@ interrupt_entry:
 6:      .long   ret_from_irq
 7:      .long   do_IRQ
 8:      .long   do_exception_error
-        
+#ifdef CONFIG_SH_FPU
+9:      .long   fpu_error_trap_handler
+#endif
+
 trap_entry:
         mov     #0x30,r8
         cmp/ge  r8,r9           ! vector 0x20-0x2f is systemcall
@@ -250,7 +265,7 @@ ENTRY(sh_bios_handler)
 1:      .long   gdb_vbr_vector
 #endif /* CONFIG_SH_STANDARD_BIOS */
 
-ENTRY(address_error_handler)
+ENTRY(address_error_trap_handler)
         mov     r15,r4                          ! regs
         add     #4,r4
         mov     #OFF_PC,r0
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
index ec6adc3f306f..b230eb278cef 100644
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -65,7 +65,7 @@ static struct intc_prio_reg prio_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, groups,
-                         NULL, NULL, prio_registers, NULL);
+                         NULL, prio_registers, NULL);
 
 static struct plat_sci_port sci_platform_data[] = {
         {
diff --git a/arch/sh/kernel/cpu/sh2a/Makefile b/arch/sh/kernel/cpu/sh2a/Makefile
index 965fa2572b23..b279cdc3a233 100644
--- a/arch/sh/kernel/cpu/sh2a/Makefile
+++ b/arch/sh/kernel/cpu/sh2a/Makefile
@@ -6,4 +6,8 @@ obj-y	:= common.o probe.o opcode_helper.o
 
 common-y        += $(addprefix ../sh2/, ex.o entry.o)
 
+obj-$(CONFIG_SH_FPU)    += fpu.o
+
 obj-$(CONFIG_CPU_SUBTYPE_SH7206) += setup-sh7206.o clock-sh7206.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7203) += setup-sh7203.o clock-sh7203.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7263) += setup-sh7203.o clock-sh7203.o
diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7203.c b/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
new file mode 100644
index 000000000000..3feb95a4fcbc
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
@@ -0,0 +1,89 @@
+/*
+ * arch/sh/kernel/cpu/sh2a/clock-sh7203.c
+ *
+ * SH7203 support for the clock framework
+ *
+ *  Copyright (C) 2007 Kieran Bingham (MPC-Data Ltd)
+ *
+ * Based on clock-sh7263.c
+ *  Copyright (C) 2006  Yoshinori Sato
+ *
+ * Based on clock-sh4.c
+ *  Copyright (C) 2005  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <asm/clock.h>
+#include <asm/freq.h>
+#include <asm/io.h>
+
+const static int pll1rate[]={8,12,16,0};
+const static int pfc_divisors[]={1,2,3,4,6,8,12};
+#define ifc_divisors pfc_divisors
+
+#if (CONFIG_SH_CLK_MD == 0)
+#define PLL2 (1)
+#elif (CONFIG_SH_CLK_MD == 1)
+#define PLL2 (2)
+#elif (CONFIG_SH_CLK_MD == 2)
+#define PLL2 (4)
+#elif (CONFIG_SH_CLK_MD == 3)
+#define PLL2 (4)
+#else
+#error "Illegal Clock Mode!"
+#endif
+
+static void master_clk_init(struct clk *clk)
+{
+        clk->rate *= pll1rate[(ctrl_inw(FREQCR) >> 8) & 0x0003] * PLL2 ;
+}
+
+static struct clk_ops sh7203_master_clk_ops = {
+        .init           = master_clk_init,
+};
+
+static void module_clk_recalc(struct clk *clk)
+{
+        int idx = (ctrl_inw(FREQCR) & 0x0007);
+        clk->rate = clk->parent->rate / pfc_divisors[idx];
+}
+
+static struct clk_ops sh7203_module_clk_ops = {
+        .recalc         = module_clk_recalc,
+};
+
+static void bus_clk_recalc(struct clk *clk)
+{
+        int idx = (ctrl_inw(FREQCR) & 0x0007);
+        clk->rate = clk->parent->rate / pfc_divisors[idx-2];
+}
+
+static struct clk_ops sh7203_bus_clk_ops = {
+        .recalc         = bus_clk_recalc,
+};
+
+static void cpu_clk_recalc(struct clk *clk)
+{
+        clk->rate = clk->parent->rate;
+}
+
+static struct clk_ops sh7203_cpu_clk_ops = {
+        .recalc         = cpu_clk_recalc,
+};
+
+static struct clk_ops *sh7203_clk_ops[] = {
+        &sh7203_master_clk_ops,
+        &sh7203_module_clk_ops,
+        &sh7203_bus_clk_ops,
+        &sh7203_cpu_clk_ops,
+};
+
+void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
+{
+        if (idx < ARRAY_SIZE(sh7203_clk_ops))
+                *ops = sh7203_clk_ops[idx];
+}
diff --git a/arch/sh/kernel/cpu/sh2a/fpu.c b/arch/sh/kernel/cpu/sh2a/fpu.c
new file mode 100644
index 000000000000..ff99562456fb
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2a/fpu.c
@@ -0,0 +1,633 @@
+/*
+ * Save/restore floating point context for signal handlers.
+ *
+ * Copyright (C) 1999, 2000  Kaz Kojima & Niibe Yutaka
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * FIXME! These routines can be optimized in big endian case.
+ */
+#include <linux/sched.h>
+#include <linux/signal.h>
+#include <asm/processor.h>
+#include <asm/io.h>
+
+/* The PR (precision) bit in the FP Status Register must be clear when
+ * an frchg instruction is executed, otherwise the instruction is undefined.
+ * Executing frchg with PR set causes a trap on some SH4 implementations.
+ */
+
+#define FPSCR_RCHG 0x00000000
+
+
+/*
+ * Save FPU registers onto task structure.
+ * Assume called with FPU enabled (SR.FD=0).
+ */
+void
+save_fpu(struct task_struct *tsk, struct pt_regs *regs)
+{
+        unsigned long dummy;
+
+        clear_tsk_thread_flag(tsk, TIF_USEDFPU);
+        enable_fpu();
+        asm volatile("sts.l     fpul, @-%0\n\t"
+                     "sts.l     fpscr, @-%0\n\t"
+                     "fmov.s    fr15, @-%0\n\t"
+                     "fmov.s    fr14, @-%0\n\t"
+                     "fmov.s    fr13, @-%0\n\t"
+                     "fmov.s    fr12, @-%0\n\t"
+                     "fmov.s    fr11, @-%0\n\t"
+                     "fmov.s    fr10, @-%0\n\t"
+                     "fmov.s    fr9, @-%0\n\t"
+                     "fmov.s    fr8, @-%0\n\t"
+                     "fmov.s    fr7, @-%0\n\t"
+                     "fmov.s    fr6, @-%0\n\t"
+                     "fmov.s    fr5, @-%0\n\t"
+                     "fmov.s    fr4, @-%0\n\t"
+                     "fmov.s    fr3, @-%0\n\t"
+                     "fmov.s    fr2, @-%0\n\t"
+                     "fmov.s    fr1, @-%0\n\t"
+                     "fmov.s    fr0, @-%0\n\t"
+                     "lds       %3, fpscr\n\t"
+                     : "=r" (dummy)
+                     : "0" ((char *)(&tsk->thread.fpu.hard.status)),
+                       "r" (FPSCR_RCHG),
+                       "r" (FPSCR_INIT)
+                     : "memory");
+
+        disable_fpu();
+        release_fpu(regs);
+}
+
+static void
+restore_fpu(struct task_struct *tsk)
+{
+        unsigned long dummy;
+
+        enable_fpu();
+        asm volatile("fmov.s    @%0+, fr0\n\t"
+                     "fmov.s    @%0+, fr1\n\t"
+                     "fmov.s    @%0+, fr2\n\t"
+                     "fmov.s    @%0+, fr3\n\t"
+                     "fmov.s    @%0+, fr4\n\t"
+                     "fmov.s    @%0+, fr5\n\t"
+                     "fmov.s    @%0+, fr6\n\t"
+                     "fmov.s    @%0+, fr7\n\t"
+                     "fmov.s    @%0+, fr8\n\t"
+                     "fmov.s    @%0+, fr9\n\t"
+                     "fmov.s    @%0+, fr10\n\t"
+                     "fmov.s    @%0+, fr11\n\t"
+                     "fmov.s    @%0+, fr12\n\t"
+                     "fmov.s    @%0+, fr13\n\t"
+                     "fmov.s    @%0+, fr14\n\t"
+                     "fmov.s    @%0+, fr15\n\t"
+                     "lds.l     @%0+, fpscr\n\t"
+                     "lds.l     @%0+, fpul\n\t"
+                     : "=r" (dummy)
+                     : "0" (&tsk->thread.fpu), "r" (FPSCR_RCHG)
+                     : "memory");
+        disable_fpu();
+}
+
+/*
+ * Load the FPU with signalling NANS.  This bit pattern we're using
+ * has the property that no matter wether considered as single or as
+ * double precission represents signaling NANS.
+ */
+
+static void
+fpu_init(void)
+{
+        enable_fpu();
+        asm volatile("lds       %0, fpul\n\t"
+                     "fsts      fpul, fr0\n\t"
+                     "fsts      fpul, fr1\n\t"
+                     "fsts      fpul, fr2\n\t"
+                     "fsts      fpul, fr3\n\t"
+                     "fsts      fpul, fr4\n\t"
+                     "fsts      fpul, fr5\n\t"
+                     "fsts      fpul, fr6\n\t"
+                     "fsts      fpul, fr7\n\t"
+                     "fsts      fpul, fr8\n\t"
+                     "fsts      fpul, fr9\n\t"
+                     "fsts      fpul, fr10\n\t"
+                     "fsts      fpul, fr11\n\t"
+                     "fsts      fpul, fr12\n\t"
+                     "fsts      fpul, fr13\n\t"
+                     "fsts      fpul, fr14\n\t"
+                     "fsts      fpul, fr15\n\t"
+                     "lds       %2, fpscr\n\t"
+                     : /* no output */
+                     : "r" (0), "r" (FPSCR_RCHG), "r" (FPSCR_INIT));
+        disable_fpu();
+}
+
+/*
+ *      Emulate arithmetic ops on denormalized number for some FPU insns.
+ */
+
+/* denormalized float * float */
+static int denormal_mulf(int hx, int hy)
+{
+        unsigned int ix, iy;
+        unsigned long long m, n;
+        int exp, w;
+
+        ix = hx & 0x7fffffff;
+        iy = hy & 0x7fffffff;
+        if (iy < 0x00800000 || ix == 0)
+                return ((hx ^ hy) & 0x80000000);
+
+        exp = (iy & 0x7f800000) >> 23;
+        ix &= 0x007fffff;
+        iy = (iy & 0x007fffff) | 0x00800000;
+        m = (unsigned long long)ix * iy;
+        n = m;
+        w = -1;
+        while (n) { n >>= 1; w++; }
+
+        /* FIXME: use guard bits */
+        exp += w - 126 - 46;
+        if (exp > 0)
+                ix = ((int) (m >> (w - 23)) & 0x007fffff) | (exp << 23);
+        else if (exp + 22 >= 0)
+                ix = (int) (m >> (w - 22 - exp)) & 0x007fffff;
+        else
+                ix = 0;
+
+        ix |= (hx ^ hy) & 0x80000000;
+        return ix;
+}
+
+/* denormalized double * double */
+static void mult64(unsigned long long x, unsigned long long y,
+                unsigned long long *highp, unsigned long long *lowp)
+{
+        unsigned long long sub0, sub1, sub2, sub3;
+        unsigned long long high, low;
+
+        sub0 = (x >> 32) * (unsigned long) (y >> 32);
+        sub1 = (x & 0xffffffffLL) * (unsigned long) (y >> 32);
+        sub2 = (x >> 32) * (unsigned long) (y & 0xffffffffLL);
+        sub3 = (x & 0xffffffffLL) * (unsigned long) (y & 0xffffffffLL);
+        low = sub3;
+        high = 0LL;
+        sub3 += (sub1 << 32);
+        if (low > sub3)
+                high++;
+        low = sub3;
+        sub3 += (sub2 << 32);
+        if (low > sub3)
+                high++;
+        low = sub3;
+        high += (sub1 >> 32) + (sub2 >> 32);
+        high += sub0;
+        *lowp = low;
+        *highp = high;
+}
+
+static inline long long rshift64(unsigned long long mh,
+                unsigned long long ml, int n)
+{
+        if (n >= 64)
+                return mh >> (n - 64);
+        return (mh << (64 - n)) | (ml >> n);
+}
+
+static long long denormal_muld(long long hx, long long hy)
+{
+        unsigned long long ix, iy;
+        unsigned long long mh, ml, nh, nl;
+        int exp, w;
+
+        ix = hx & 0x7fffffffffffffffLL;
+        iy = hy & 0x7fffffffffffffffLL;
+        if (iy < 0x0010000000000000LL || ix == 0)
+                return ((hx ^ hy) & 0x8000000000000000LL);
+
+        exp = (iy & 0x7ff0000000000000LL) >> 52;
+        ix &= 0x000fffffffffffffLL;
+        iy = (iy & 0x000fffffffffffffLL) | 0x0010000000000000LL;
+        mult64(ix, iy, &mh, &ml);
+        nh = mh;
+        nl = ml;
+        w = -1;
+        if (nh) {
+                while (nh) { nh >>= 1; w++;}
+                w += 64;
+        } else
+                while (nl) { nl >>= 1; w++;}
+
+        /* FIXME: use guard bits */
+        exp += w - 1022 - 52 * 2;
+        if (exp > 0)
+                ix = (rshift64(mh, ml, w - 52) & 0x000fffffffffffffLL)
+                        | ((long long)exp << 52);
+        else if (exp + 51 >= 0)
+                ix = rshift64(mh, ml, w - 51 - exp) & 0x000fffffffffffffLL;
+        else
+                ix = 0;
+
+        ix |= (hx ^ hy) & 0x8000000000000000LL;
+        return ix;
+}
+
+/* ix - iy where iy: denormal and ix, iy >= 0 */
+static int denormal_subf1(unsigned int ix, unsigned int iy)
+{
+        int frac;
+        int exp;
+
+        if (ix < 0x00800000)
+                return ix - iy;
+
+        exp = (ix & 0x7f800000) >> 23;
+        if (exp - 1 > 31)
+                return ix;
+        iy >>= exp - 1;
+        if (iy == 0)
+                return ix;
+
+        frac = (ix & 0x007fffff) | 0x00800000;
+        frac -= iy;
+        while (frac < 0x00800000) {
+                if (--exp == 0)
+                        return frac;
+                frac <<= 1;
+        }
+
+        return (exp << 23) | (frac & 0x007fffff);
+}
+
+/* ix + iy where iy: denormal and ix, iy >= 0 */
+static int denormal_addf1(unsigned int ix, unsigned int iy)
+{
+        int frac;
+        int exp;
+
+        if (ix < 0x00800000)
+                return ix + iy;
+
+        exp = (ix & 0x7f800000) >> 23;
+        if (exp - 1 > 31)
+                return ix;
+        iy >>= exp - 1;
+        if (iy == 0)
+          return ix;
+
+        frac = (ix & 0x007fffff) | 0x00800000;
+        frac += iy;
+        if (frac >= 0x01000000) {
+                frac >>= 1;
+                ++exp;
+        }
+
+        return (exp << 23) | (frac & 0x007fffff);
+}
+
+static int denormal_addf(int hx, int hy)
+{
+        unsigned int ix, iy;
+        int sign;
+
+        if ((hx ^ hy) & 0x80000000) {
+                sign = hx & 0x80000000;
+                ix = hx & 0x7fffffff;
+                iy = hy & 0x7fffffff;
+                if (iy < 0x00800000) {
+                        ix = denormal_subf1(ix, iy);
+                        if (ix < 0) {
+                                ix = -ix;
+                                sign ^= 0x80000000;
+                        }
+                } else {
+                        ix = denormal_subf1(iy, ix);
+                        sign ^= 0x80000000;
+                }
+        } else {
+                sign = hx & 0x80000000;
+                ix = hx & 0x7fffffff;
+                iy = hy & 0x7fffffff;
+                if (iy < 0x00800000)
+                        ix = denormal_addf1(ix, iy);
+                else
+                        ix = denormal_addf1(iy, ix);
+        }
+
+        return sign | ix;
+}
+
+/* ix - iy where iy: denormal and ix, iy >= 0 */
+static long long denormal_subd1(unsigned long long ix, unsigned long long iy)
+{
+        long long frac;
+        int exp;
+
+        if (ix < 0x0010000000000000LL)
+                return ix - iy;
+
+        exp = (ix & 0x7ff0000000000000LL) >> 52;
+        if (exp - 1 > 63)
+                return ix;
+        iy >>= exp - 1;
+        if (iy == 0)
+                return ix;
+
+        frac = (ix & 0x000fffffffffffffLL) | 0x0010000000000000LL;
+        frac -= iy;
+        while (frac < 0x0010000000000000LL) {
+                if (--exp == 0)
+                        return frac;
+                frac <<= 1;
+        }
+
+        return ((long long)exp << 52) | (frac & 0x000fffffffffffffLL);
+}
+
+/* ix + iy where iy: denormal and ix, iy >= 0 */
+static long long denormal_addd1(unsigned long long ix, unsigned long long iy)
+{
+        long long frac;
+        long long exp;
+
+        if (ix < 0x0010000000000000LL)
+                return ix + iy;
+
+        exp = (ix & 0x7ff0000000000000LL) >> 52;
+        if (exp - 1 > 63)
+                return ix;
+        iy >>= exp - 1;
+        if (iy == 0)
+          return ix;
+
+        frac = (ix & 0x000fffffffffffffLL) | 0x0010000000000000LL;
+        frac += iy;
+        if (frac >= 0x0020000000000000LL) {
+                frac >>= 1;
+                ++exp;
+        }
+
+        return (exp << 52) | (frac & 0x000fffffffffffffLL);
+}
+
+static long long denormal_addd(long long hx, long long hy)
+{
+        unsigned long long ix, iy;
+        long long sign;
+
+        if ((hx ^ hy) & 0x8000000000000000LL) {
+                sign = hx & 0x8000000000000000LL;
+                ix = hx & 0x7fffffffffffffffLL;
+                iy = hy & 0x7fffffffffffffffLL;
+                if (iy < 0x0010000000000000LL) {
+                        ix = denormal_subd1(ix, iy);
+                        if (ix < 0) {
+                                ix = -ix;
+                                sign ^= 0x8000000000000000LL;
+                        }
+                } else {
+                        ix = denormal_subd1(iy, ix);
+                        sign ^= 0x8000000000000000LL;
+                }
+        } else {
+                sign = hx & 0x8000000000000000LL;
+                ix = hx & 0x7fffffffffffffffLL;
+                iy = hy & 0x7fffffffffffffffLL;
+                if (iy < 0x0010000000000000LL)
+                        ix = denormal_addd1(ix, iy);
+                else
+                        ix = denormal_addd1(iy, ix);
+        }
+
+        return sign | ix;
+}
+
+/**
+ *      denormal_to_double - Given denormalized float number,
+ *                           store double float
+ *
+ *      @fpu: Pointer to sh_fpu_hard structure
+ *      @n: Index to FP register
+ */
+static void
+denormal_to_double (struct sh_fpu_hard_struct *fpu, int n)
+{
+        unsigned long du, dl;
+        unsigned long x = fpu->fpul;
+        int exp = 1023 - 126;
+
+        if (x != 0 && (x & 0x7f800000) == 0) {
+                du = (x & 0x80000000);
+                while ((x & 0x00800000) == 0) {
+                        x <<= 1;
+                        exp--;
+                }
+                x &= 0x007fffff;
+                du |= (exp << 20) | (x >> 3);
+                dl = x << 29;
+
+                fpu->fp_regs[n] = du;
+                fpu->fp_regs[n+1] = dl;
+        }
+}
+
+/**
+ *      ieee_fpe_handler - Handle denormalized number exception
+ *
+ *      @regs: Pointer to register structure
+ *
+ *      Returns 1 when it's handled (should not cause exception).
+ */
+static int
+ieee_fpe_handler (struct pt_regs *regs)
+{
+        unsigned short insn = *(unsigned short *) regs->pc;
+        unsigned short finsn;
+        unsigned long nextpc;
+        int nib[4] = {
+                (insn >> 12) & 0xf,
+                (insn >> 8) & 0xf,
+                (insn >> 4) & 0xf,
+                insn & 0xf};
+
+        if (nib[0] == 0xb ||
+            (nib[0] == 0x4 && nib[2] == 0x0 && nib[3] == 0xb)) /* bsr & jsr */
+                regs->pr = regs->pc + 4;
+        if (nib[0] == 0xa || nib[0] == 0xb) { /* bra & bsr */
+                nextpc = regs->pc + 4 + ((short) ((insn & 0xfff) << 4) >> 3);
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else if (nib[0] == 0x8 && nib[1] == 0xd) { /* bt/s */
+                if (regs->sr & 1)
+                        nextpc = regs->pc + 4 + ((char) (insn & 0xff) << 1);
+                else
+                        nextpc = regs->pc + 4;
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else if (nib[0] == 0x8 && nib[1] == 0xf) { /* bf/s */
+                if (regs->sr & 1)
+                        nextpc = regs->pc + 4;
+                else
+                        nextpc = regs->pc + 4 + ((char) (insn & 0xff) << 1);
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else if (nib[0] == 0x4 && nib[3] == 0xb &&
+                 (nib[2] == 0x0 || nib[2] == 0x2)) { /* jmp & jsr */
+                nextpc = regs->regs[nib[1]];
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else if (nib[0] == 0x0 && nib[3] == 0x3 &&
+                 (nib[2] == 0x0 || nib[2] == 0x2)) { /* braf & bsrf */
+                nextpc = regs->pc + 4 + regs->regs[nib[1]];
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else if (insn == 0x000b) { /* rts */
+                nextpc = regs->pr;
+                finsn = *(unsigned short *) (regs->pc + 2);
+        } else {
+                nextpc = regs->pc + 2;
+                finsn = insn;
+        }
+
+#define FPSCR_FPU_ERROR (1 << 17)
+
+        if ((finsn & 0xf1ff) == 0xf0ad) { /* fcnvsd */
+                struct task_struct *tsk = current;
+
+                if ((tsk->thread.fpu.hard.fpscr & FPSCR_FPU_ERROR)) {
+                        /* FPU error */
+                        denormal_to_double (&tsk->thread.fpu.hard,
+                                            (finsn >> 8) & 0xf);
+                } else
+                        return 0;
+
+                regs->pc = nextpc;
+                return 1;
+        } else if ((finsn & 0xf00f) == 0xf002) { /* fmul */
+                struct task_struct *tsk = current;
+                int fpscr;
+                int n, m, prec;
+                unsigned int hx, hy;
+
+                n = (finsn >> 8) & 0xf;
+                m = (finsn >> 4) & 0xf;
+                hx = tsk->thread.fpu.hard.fp_regs[n];
+                hy = tsk->thread.fpu.hard.fp_regs[m];
+                fpscr = tsk->thread.fpu.hard.fpscr;
+                prec = fpscr & (1 << 19);
+
+                if ((fpscr & FPSCR_FPU_ERROR)
+                     && (prec && ((hx & 0x7fffffff) < 0x00100000
+                                   || (hy & 0x7fffffff) < 0x00100000))) {
+                        long long llx, lly;
+
+                        /* FPU error because of denormal */
+                        llx = ((long long) hx << 32)
+                               | tsk->thread.fpu.hard.fp_regs[n+1];
+                        lly = ((long long) hy << 32)
+                               | tsk->thread.fpu.hard.fp_regs[m+1];
+                        if ((hx & 0x7fffffff) >= 0x00100000)
+                                llx = denormal_muld(lly, llx);
+                        else
+                                llx = denormal_muld(llx, lly);
+                        tsk->thread.fpu.hard.fp_regs[n] = llx >> 32;
+                        tsk->thread.fpu.hard.fp_regs[n+1] = llx & 0xffffffff;
+                } else if ((fpscr & FPSCR_FPU_ERROR)
+                     && (!prec && ((hx & 0x7fffffff) < 0x00800000
+                                   || (hy & 0x7fffffff) < 0x00800000))) {
+                        /* FPU error because of denormal */
+                        if ((hx & 0x7fffffff) >= 0x00800000)
+                                hx = denormal_mulf(hy, hx);
+                        else
+                                hx = denormal_mulf(hx, hy);
+                        tsk->thread.fpu.hard.fp_regs[n] = hx;
+                } else
+                        return 0;
+
+                regs->pc = nextpc;
+                return 1;
+        } else if ((finsn & 0xf00e) == 0xf000) { /* fadd, fsub */
+                struct task_struct *tsk = current;
+                int fpscr;
+                int n, m, prec;
+                unsigned int hx, hy;
+
+                n = (finsn >> 8) & 0xf;
+                m = (finsn >> 4) & 0xf;
+                hx = tsk->thread.fpu.hard.fp_regs[n];
+                hy = tsk->thread.fpu.hard.fp_regs[m];
+                fpscr = tsk->thread.fpu.hard.fpscr;
+                prec = fpscr & (1 << 19);
+
+                if ((fpscr & FPSCR_FPU_ERROR)
+                     && (prec && ((hx & 0x7fffffff) < 0x00100000
+                                   || (hy & 0x7fffffff) < 0x00100000))) {
+                        long long llx, lly;
+
+                        /* FPU error because of denormal */
+                        llx = ((long long) hx << 32)
+                               | tsk->thread.fpu.hard.fp_regs[n+1];
+                        lly = ((long long) hy << 32)
+                               | tsk->thread.fpu.hard.fp_regs[m+1];
+                        if ((finsn & 0xf00f) == 0xf000)
+                                llx = denormal_addd(llx, lly);
+                        else
+                                llx = denormal_addd(llx, lly ^ (1LL << 63));
+                        tsk->thread.fpu.hard.fp_regs[n] = llx >> 32;
+                        tsk->thread.fpu.hard.fp_regs[n+1] = llx & 0xffffffff;
+                } else if ((fpscr & FPSCR_FPU_ERROR)
+                     && (!prec && ((hx & 0x7fffffff) < 0x00800000
+                                   || (hy & 0x7fffffff) < 0x00800000))) {
+                        /* FPU error because of denormal */
+                        if ((finsn & 0xf00f) == 0xf000)
+                                hx = denormal_addf(hx, hy);
+                        else
+                                hx = denormal_addf(hx, hy ^ 0x80000000);
+                        tsk->thread.fpu.hard.fp_regs[n] = hx;
+                } else
+                        return 0;
+
+                regs->pc = nextpc;
+                return 1;
+        }
+
+        return 0;
+}
+
+BUILD_TRAP_HANDLER(fpu_error)
+{
+        struct task_struct *tsk = current;
+        TRAP_HANDLER_DECL;
+
+        save_fpu(tsk, regs);
+        if (ieee_fpe_handler(regs)) {
+                tsk->thread.fpu.hard.fpscr &=
+                        ~(FPSCR_CAUSE_MASK | FPSCR_FLAG_MASK);
+                grab_fpu(regs);
+                restore_fpu(tsk);
+                set_tsk_thread_flag(tsk, TIF_USEDFPU);
+                return;
+        }
+
+        force_sig(SIGFPE, tsk);
+}
+
+BUILD_TRAP_HANDLER(fpu_state_restore)
+{
+        struct task_struct *tsk = current;
+        TRAP_HANDLER_DECL;
+
+        grab_fpu(regs);
+        if (!user_mode(regs)) {
+                printk(KERN_ERR "BUG: FPU is used in kernel mode.\n");
+                return;
+        }
+
+        if (used_math()) {
+                /* Using the FPU again.  */
+                restore_fpu(tsk);
+        } else  {
+                /* First time FPU user.  */
+                fpu_init();
+                set_used_math();
+        }
+        set_tsk_thread_flag(tsk, TIF_USEDFPU);
+}
diff --git a/arch/sh/kernel/cpu/sh2a/probe.c b/arch/sh/kernel/cpu/sh2a/probe.c
index 6d02465704b9..6910e2664468 100644
--- a/arch/sh/kernel/cpu/sh2a/probe.c
+++ b/arch/sh/kernel/cpu/sh2a/probe.c
@@ -3,25 +3,36 @@
  *
  * CPU Subtype Probing for SH-2A.
  *
- * Copyright (C) 2004, 2005 Paul Mundt
+ * Copyright (C) 2004 - 2007  Paul Mundt
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
-
 #include <linux/init.h>
 #include <asm/processor.h>
 #include <asm/cache.h>
 
 int __init detect_cpu_and_cache_system(void)
 {
-        /* Just SH7206 for now .. */
-        boot_cpu_data.type                      = CPU_SH7206;
+        /* All SH-2A CPUs have support for 16 and 32-bit opcodes.. */
         boot_cpu_data.flags                     |= CPU_HAS_OP32;
 
+#if defined(CONFIG_CPU_SUBTYPE_SH7203)
+        boot_cpu_data.type                      = CPU_SH7203;
+        /* SH7203 has an FPU.. */
+        boot_cpu_data.flags                     |= CPU_HAS_FPU;
+#elif defined(CONFIG_CPU_SUBTYPE_SH7263)
+        boot_cpu_data.type                      = CPU_SH7263;
+        boot_cpu_data.flags                     |= CPU_HAS_FPU;
+#elif defined(CONFIG_CPU_SUBTYPE_SH7206)
+        boot_cpu_data.type                      = CPU_SH7206;
+        /* While SH7206 has a DSP.. */
+        boot_cpu_data.flags                     |= CPU_HAS_DSP;
+#endif
+
         boot_cpu_data.dcache.ways               = 4;
-        boot_cpu_data.dcache.way_incr   = (1 << 11);
+        boot_cpu_data.dcache.way_incr           = (1 << 11);
         boot_cpu_data.dcache.sets               = 128;
         boot_cpu_data.dcache.entry_shift        = 4;
         boot_cpu_data.dcache.linesz             = L1_CACHE_BYTES;
@@ -37,4 +48,3 @@ int __init detect_cpu_and_cache_system(void)
 
         return 0;
 }
-
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
new file mode 100644
index 000000000000..db6ef5cecde1
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
@@ -0,0 +1,319 @@
+/*
+ * SH7203 and SH7263 Setup
+ *
+ *  Copyright (C) 2007  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+enum {
+        UNUSED = 0,
+
+        /* interrupt sources */
+        IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7,
+        PINT0, PINT1, PINT2, PINT3, PINT4, PINT5, PINT6, PINT7,
+        DMAC0_DEI, DMAC0_HEI, DMAC1_DEI, DMAC1_HEI,
+        DMAC2_DEI, DMAC2_HEI, DMAC3_DEI, DMAC3_HEI,
+        DMAC4_DEI, DMAC4_HEI, DMAC5_DEI, DMAC5_HEI,
+        DMAC6_DEI, DMAC6_HEI, DMAC7_DEI, DMAC7_HEI,
+        USB, LCDC, CMT0, CMT1, BSC, WDT,
+        MTU2_TGI0A, MTU2_TGI0B, MTU2_TGI0C, MTU2_TGI0D,
+        MTU2_TCI0V, MTU2_TGI0E, MTU2_TGI0F,
+        MTU2_TGI1A, MTU2_TGI1B, MTU2_TCI1V, MTU2_TCI1U,
+        MTU2_TGI2A, MTU2_TGI2B, MTU2_TCI2V, MTU2_TCI2U,
+        MTU2_TGI3A, MTU2_TGI3B, MTU2_TGI3C, MTU2_TGI3D, MTU2_TCI3V,
+        MTU2_TGI4A, MTU2_TGI4B, MTU2_TGI4C, MTU2_TGI4D, MTU2_TCI4V,
+        ADC_ADI,
+        IIC30_STPI, IIC30_NAKI, IIC30_RXI, IIC30_TXI, IIC30_TEI,
+        IIC31_STPI, IIC31_NAKI, IIC31_RXI, IIC31_TXI, IIC31_TEI,
+        IIC32_STPI, IIC32_NAKI, IIC32_RXI, IIC32_TXI, IIC32_TEI,
+        IIC33_STPI, IIC33_NAKI, IIC33_RXI, IIC33_TXI, IIC33_TEI,
+        SCIF0_BRI, SCIF0_ERI, SCIF0_RXI, SCIF0_TXI,
+        SCIF1_BRI, SCIF1_ERI, SCIF1_RXI, SCIF1_TXI,
+        SCIF2_BRI, SCIF2_ERI, SCIF2_RXI, SCIF2_TXI,
+        SCIF3_BRI, SCIF3_ERI, SCIF3_RXI, SCIF3_TXI,
+        SSU0_SSERI, SSU0_SSRXI, SSU0_SSTXI,
+        SSU1_SSERI, SSU1_SSRXI, SSU1_SSTXI,
+        SSI0_SSII, SSI1_SSII, SSI2_SSII, SSI3_SSII,
+
+        /* ROM-DEC, SDHI, SRC, and IEB are SH7263 specific */
+        ROMDEC_ISY, ROMDEC_IERR, ROMDEC_IARG, ROMDEC_ISEC, ROMDEC_IBUF,
+        ROMDEC_IREADY,
+
+        FLCTL_FLSTEI, FLCTL_FLTENDI, FLCTL_FLTREQ0I, FLCTL_FLTREQ1I,
+
+        SDHI3, SDHI0, SDHI1,
+
+        RTC_ARM, RTC_PRD, RTC_CUP,
+        RCAN0_ERS, RCAN0_OVR, RCAN0_RM0, RCAN0_RM1, RCAN0_SLE,
+        RCAN1_ERS, RCAN1_OVR, RCAN1_RM0, RCAN1_RM1, RCAN1_SLE,
+
+        SRC_OVF, SRC_ODFI, SRC_IDEI, IEBI,
+
+        /* interrupt groups */
+        PINT, DMAC0, DMAC1, DMAC2, DMAC3, DMAC4, DMAC5, DMAC6, DMAC7,
+        MTU0_ABCD, MTU0_VEF, MTU1_AB, MTU1_VU, MTU2_AB, MTU2_VU,
+        MTU3_ABCD, MTU4_ABCD,
+        IIC30, IIC31, IIC32, IIC33, SCIF0, SCIF1, SCIF2, SCIF3,
+        SSU0, SSU1, ROMDEC, SDHI, FLCTL, RTC, RCAN0, RCAN1, SRC
+};
+
+static struct intc_vect vectors[] __initdata = {
+        INTC_IRQ(IRQ0, 64), INTC_IRQ(IRQ1, 65),
+        INTC_IRQ(IRQ2, 66), INTC_IRQ(IRQ3, 67),
+        INTC_IRQ(IRQ4, 68), INTC_IRQ(IRQ5, 69),
+        INTC_IRQ(IRQ6, 70), INTC_IRQ(IRQ7, 71),
+        INTC_IRQ(PINT0, 80), INTC_IRQ(PINT1, 81),
+        INTC_IRQ(PINT2, 82), INTC_IRQ(PINT3, 83),
+        INTC_IRQ(PINT4, 84), INTC_IRQ(PINT5, 85),
+        INTC_IRQ(PINT6, 86), INTC_IRQ(PINT7, 87),
+        INTC_IRQ(DMAC0_DEI, 108), INTC_IRQ(DMAC0_HEI, 109),
+        INTC_IRQ(DMAC1_DEI, 112), INTC_IRQ(DMAC1_HEI, 113),
+        INTC_IRQ(DMAC2_DEI, 116), INTC_IRQ(DMAC2_HEI, 117),
+        INTC_IRQ(DMAC3_DEI, 120), INTC_IRQ(DMAC3_HEI, 121),
+        INTC_IRQ(DMAC4_DEI, 124), INTC_IRQ(DMAC4_HEI, 125),
+        INTC_IRQ(DMAC5_DEI, 128), INTC_IRQ(DMAC5_HEI, 129),
+        INTC_IRQ(DMAC6_DEI, 132), INTC_IRQ(DMAC6_HEI, 133),
+        INTC_IRQ(DMAC7_DEI, 136), INTC_IRQ(DMAC7_HEI, 137),
+        INTC_IRQ(USB, 140), INTC_IRQ(LCDC, 141),
+        INTC_IRQ(CMT0, 142), INTC_IRQ(CMT1, 143),
+        INTC_IRQ(BSC, 144), INTC_IRQ(WDT, 145),
+        INTC_IRQ(MTU2_TGI0A, 146), INTC_IRQ(MTU2_TGI0B, 147),
+        INTC_IRQ(MTU2_TGI0C, 148), INTC_IRQ(MTU2_TGI0D, 149),
+        INTC_IRQ(MTU2_TCI0V, 150),
+        INTC_IRQ(MTU2_TGI0E, 151), INTC_IRQ(MTU2_TGI0F, 152),
+        INTC_IRQ(MTU2_TGI1A, 153), INTC_IRQ(MTU2_TGI1B, 154),
+        INTC_IRQ(MTU2_TCI1V, 155), INTC_IRQ(MTU2_TCI1U, 156),
+        INTC_IRQ(MTU2_TGI2A, 157), INTC_IRQ(MTU2_TGI2B, 158),
+        INTC_IRQ(MTU2_TCI2V, 159), INTC_IRQ(MTU2_TCI2U, 160),
+        INTC_IRQ(MTU2_TGI3A, 161), INTC_IRQ(MTU2_TGI3B, 162),
+        INTC_IRQ(MTU2_TGI3C, 163), INTC_IRQ(MTU2_TGI3D, 164),
+        INTC_IRQ(MTU2_TCI3V, 165),
+        INTC_IRQ(MTU2_TGI4A, 166), INTC_IRQ(MTU2_TGI4B, 167),
+        INTC_IRQ(MTU2_TGI4C, 168), INTC_IRQ(MTU2_TGI4D, 169),
+        INTC_IRQ(MTU2_TCI4V, 170),
+        INTC_IRQ(ADC_ADI, 171),
+        INTC_IRQ(IIC30_STPI, 172), INTC_IRQ(IIC30_NAKI, 173),
+        INTC_IRQ(IIC30_RXI, 174), INTC_IRQ(IIC30_TXI, 175),
+        INTC_IRQ(IIC30_TEI, 176),
+        INTC_IRQ(IIC31_STPI, 177), INTC_IRQ(IIC31_NAKI, 178),
+        INTC_IRQ(IIC31_RXI, 179), INTC_IRQ(IIC31_TXI, 180),
+        INTC_IRQ(IIC31_TEI, 181),
+        INTC_IRQ(IIC32_STPI, 182), INTC_IRQ(IIC32_NAKI, 183),
+        INTC_IRQ(IIC32_RXI, 184), INTC_IRQ(IIC32_TXI, 185),
+        INTC_IRQ(IIC32_TEI, 186),
+        INTC_IRQ(IIC33_STPI, 187), INTC_IRQ(IIC33_NAKI, 188),
+        INTC_IRQ(IIC33_RXI, 189), INTC_IRQ(IIC33_TXI, 190),
+        INTC_IRQ(IIC33_TEI, 191),
+        INTC_IRQ(SCIF0_BRI, 192), INTC_IRQ(SCIF0_ERI, 193),
+        INTC_IRQ(SCIF0_RXI, 194), INTC_IRQ(SCIF0_TXI, 195),
+        INTC_IRQ(SCIF1_BRI, 196), INTC_IRQ(SCIF1_ERI, 197),
+        INTC_IRQ(SCIF1_RXI, 198), INTC_IRQ(SCIF1_TXI, 199),
+        INTC_IRQ(SCIF2_BRI, 200), INTC_IRQ(SCIF2_ERI, 201),
+        INTC_IRQ(SCIF2_RXI, 202), INTC_IRQ(SCIF2_TXI, 203),
+        INTC_IRQ(SCIF3_BRI, 204), INTC_IRQ(SCIF3_ERI, 205),
+        INTC_IRQ(SCIF3_RXI, 206), INTC_IRQ(SCIF3_TXI, 207),
+        INTC_IRQ(SSU0_SSERI, 208), INTC_IRQ(SSU0_SSRXI, 209),
+        INTC_IRQ(SSU0_SSTXI, 210),
+        INTC_IRQ(SSU1_SSERI, 211), INTC_IRQ(SSU1_SSRXI, 212),
+        INTC_IRQ(SSU1_SSTXI, 213),
+        INTC_IRQ(SSI0_SSII, 214), INTC_IRQ(SSI1_SSII, 215),
+        INTC_IRQ(SSI2_SSII, 216), INTC_IRQ(SSI3_SSII, 217),
+        INTC_IRQ(FLCTL_FLSTEI, 224), INTC_IRQ(FLCTL_FLTENDI, 225),
+        INTC_IRQ(FLCTL_FLTREQ0I, 226), INTC_IRQ(FLCTL_FLTREQ1I, 227),
+        INTC_IRQ(RTC_ARM, 231), INTC_IRQ(RTC_PRD, 232),
+        INTC_IRQ(RTC_CUP, 233),
+        INTC_IRQ(RCAN0_ERS, 234), INTC_IRQ(RCAN0_OVR, 235),
+        INTC_IRQ(RCAN0_RM0, 236), INTC_IRQ(RCAN0_RM1, 237),
+        INTC_IRQ(RCAN0_SLE, 238),
+        INTC_IRQ(RCAN1_ERS, 239), INTC_IRQ(RCAN1_OVR, 240),
+        INTC_IRQ(RCAN1_RM0, 241), INTC_IRQ(RCAN1_RM1, 242),
+        INTC_IRQ(RCAN1_SLE, 243),
+
+        /* SH7263-specific trash */
+#ifdef CONFIG_CPU_SUBTYPE_SH7263
+        INTC_IRQ(ROMDEC_ISY, 218), INTC_IRQ(ROMDEC_IERR, 219),
+        INTC_IRQ(ROMDEC_IARG, 220), INTC_IRQ(ROMDEC_ISEC, 221),
+        INTC_IRQ(ROMDEC_IBUF, 222), INTC_IRQ(ROMDEC_IREADY, 223),
+
+        INTC_IRQ(SDHI3, 228), INTC_IRQ(SDHI0, 229), INTC_IRQ(SDHI1, 230),
+
+        INTC_IRQ(SRC_OVF, 244), INTC_IRQ(SRC_ODFI, 245),
+        INTC_IRQ(SRC_IDEI, 246),
+
+        INTC_IRQ(IEBI, 247),
+#endif
+};
+
+static struct intc_group groups[] __initdata = {
+        INTC_GROUP(PINT, PINT0, PINT1, PINT2, PINT3,
+                   PINT4, PINT5, PINT6, PINT7),
+        INTC_GROUP(DMAC0, DMAC0_DEI, DMAC0_HEI),
+        INTC_GROUP(DMAC1, DMAC1_DEI, DMAC1_HEI),
+        INTC_GROUP(DMAC2, DMAC2_DEI, DMAC2_HEI),
+        INTC_GROUP(DMAC3, DMAC3_DEI, DMAC3_HEI),
+        INTC_GROUP(DMAC4, DMAC4_DEI, DMAC4_HEI),
+        INTC_GROUP(DMAC5, DMAC5_DEI, DMAC5_HEI),
+        INTC_GROUP(DMAC6, DMAC6_DEI, DMAC6_HEI),
+        INTC_GROUP(DMAC7, DMAC7_DEI, DMAC7_HEI),
+        INTC_GROUP(MTU0_ABCD, MTU2_TGI0A, MTU2_TGI0B, MTU2_TGI0C, MTU2_TGI0D),
+        INTC_GROUP(MTU0_VEF, MTU2_TCI0V, MTU2_TGI0E, MTU2_TGI0F),
+        INTC_GROUP(MTU1_AB, MTU2_TGI1A, MTU2_TGI1B),
+        INTC_GROUP(MTU1_VU, MTU2_TCI1V, MTU2_TCI1U),
+        INTC_GROUP(MTU2_AB, MTU2_TGI2A, MTU2_TGI2B),
+        INTC_GROUP(MTU2_VU, MTU2_TCI2V, MTU2_TCI2U),
+        INTC_GROUP(MTU3_ABCD, MTU2_TGI3A, MTU2_TGI3B, MTU2_TGI3C, MTU2_TGI3D),
+        INTC_GROUP(MTU4_ABCD, MTU2_TGI4A, MTU2_TGI4B, MTU2_TGI4C, MTU2_TGI4D),
+        INTC_GROUP(IIC30, IIC30_STPI, IIC30_NAKI, IIC30_RXI, IIC30_TXI,
+                   IIC30_TEI),
+        INTC_GROUP(IIC31, IIC31_STPI, IIC31_NAKI, IIC31_RXI, IIC31_TXI,
+                   IIC31_TEI),
+        INTC_GROUP(IIC32, IIC32_STPI, IIC32_NAKI, IIC32_RXI, IIC32_TXI,
+                   IIC32_TEI),
+        INTC_GROUP(IIC33, IIC33_STPI, IIC33_NAKI, IIC33_RXI, IIC33_TXI,
+                   IIC33_TEI),
+        INTC_GROUP(SCIF0, SCIF0_BRI, SCIF0_ERI, SCIF0_RXI, SCIF0_TXI),
+        INTC_GROUP(SCIF1, SCIF1_BRI, SCIF1_ERI, SCIF1_RXI, SCIF1_TXI),
+        INTC_GROUP(SCIF2, SCIF2_BRI, SCIF2_ERI, SCIF2_RXI, SCIF2_TXI),
+        INTC_GROUP(SCIF3, SCIF3_BRI, SCIF3_ERI, SCIF3_RXI, SCIF3_TXI),
+        INTC_GROUP(SSU0, SSU0_SSERI, SSU0_SSRXI, SSU0_SSTXI),
+        INTC_GROUP(SSU1, SSU1_SSERI, SSU1_SSRXI, SSU1_SSTXI),
+        INTC_GROUP(FLCTL, FLCTL_FLSTEI, FLCTL_FLTENDI, FLCTL_FLTREQ0I,
+                   FLCTL_FLTREQ1I),
+        INTC_GROUP(RTC, RTC_ARM, RTC_PRD, RTC_CUP),
+        INTC_GROUP(RCAN0, RCAN0_ERS, RCAN0_OVR, RCAN0_RM0, RCAN0_RM1,
+                   RCAN0_SLE),
+        INTC_GROUP(RCAN1, RCAN1_ERS, RCAN1_OVR, RCAN1_RM0, RCAN1_RM1,
+                   RCAN1_SLE),
+
+#ifdef CONFIG_CPU_SUBTYPE_SH7263
+        INTC_GROUP(ROMDEC, ROMDEC_ISY, ROMDEC_IERR, ROMDEC_IARG,
+                   ROMDEC_ISEC, ROMDEC_IBUF, ROMDEC_IREADY),
+        INTC_GROUP(SDHI, SDHI3, SDHI0, SDHI1),
+        INTC_GROUP(SRC, SRC_OVF, SRC_ODFI, SRC_IDEI),
+#endif
+};
+
+static struct intc_prio_reg prio_registers[] __initdata = {
+        { 0xfffe0818, 0, 16, 4, /* IPR01 */ { IRQ0, IRQ1, IRQ2, IRQ3 } },
+        { 0xfffe081a, 0, 16, 4, /* IPR02 */ { IRQ4, IRQ5, IRQ6, IRQ7 } },
+        { 0xfffe0820, 0, 16, 4, /* IPR05 */ { PINT, 0, 0, 0 } },
+        { 0xfffe0c00, 0, 16, 4, /* IPR06 */ { DMAC0, DMAC1, DMAC2, DMAC3 } },
+        { 0xfffe0c02, 0, 16, 4, /* IPR07 */ { DMAC4, DMAC5, DMAC6, DMAC7 } },
+        { 0xfffe0c04, 0, 16, 4, /* IPR08 */ { USB, LCDC, CMT0, CMT1 } },
+        { 0xfffe0c06, 0, 16, 4, /* IPR09 */ { BSC, WDT, MTU0_ABCD, MTU0_VEF } },
+        { 0xfffe0c08, 0, 16, 4, /* IPR10 */ { MTU1_AB, MTU1_VU, MTU2_AB,
+                                              MTU2_VU } },
+        { 0xfffe0c0a, 0, 16, 4, /* IPR11 */ { MTU3_ABCD, MTU2_TCI3V, MTU4_ABCD,
+                                              MTU2_TCI4V } },
+        { 0xfffe0c0c, 0, 16, 4, /* IPR12 */ { ADC_ADI, IIC30, IIC31, IIC32 } },
+        { 0xfffe0c0e, 0, 16, 4, /* IPR13 */ { IIC33, SCIF0, SCIF1, SCIF2 } },
+        { 0xfffe0c10, 0, 16, 4, /* IPR14 */ { SCIF3, SSU0, SSU1, SSI0_SSII } },
+#ifdef CONFIG_CPU_SUBTYPE_SH7203
+        { 0xfffe0c12, 0, 16, 4, /* IPR15 */ { SSI1_SSII, SSI2_SSII,
+                                              SSI3_SSII, 0 } },
+        { 0xfffe0c14, 0, 16, 4, /* IPR16 */ { FLCTL, 0, RTC, RCAN0 } },
+        { 0xfffe0c16, 0, 16, 4, /* IPR17 */ { RCAN1, 0, 0, 0 } },
+#else
+        { 0xfffe0c12, 0, 16, 4, /* IPR15 */ { SSI1_SSII, SSI2_SSII,
+                                              SSI3_SSII, ROMDEC } },
+        { 0xfffe0c14, 0, 16, 4, /* IPR16 */ { FLCTL, SDHI, RTC, RCAN0 } },
+        { 0xfffe0c16, 0, 16, 4, /* IPR17 */ { RCAN1, SRC, IEBI, 0 } },
+#endif
+};
+
+static struct intc_mask_reg mask_registers[] __initdata = {
+        { 0xfffe0808, 0, 16, /* PINTER */
+          { 0, 0, 0, 0, 0, 0, 0, 0,
+            PINT7, PINT6, PINT5, PINT4, PINT3, PINT2, PINT1, PINT0 } },
+};
+
+static DECLARE_INTC_DESC(intc_desc, "sh7203", vectors, groups,
+                         mask_registers, prio_registers, NULL);
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xfffe8000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           =  { 193, 194, 195, 192 },
+        }, {
+                .mapbase        = 0xfffe8800,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           =  { 197, 198, 199, 196 },
+        }, {
+                .mapbase        = 0xfffe9000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           =  { 201, 202, 203, 200 },
+        }, {
+                .mapbase        = 0xfffe9800,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           =  { 205, 206, 207, 204 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct resource rtc_resources[] = {
+        [0] = {
+                .start  = 0xffff2000,
+                .end    = 0xffff2000 + 0x58 - 1,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                /* Period IRQ */
+                .start  = 232,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                /* Carry IRQ */
+                .start  = 233,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                /* Alarm IRQ */
+                .start  = 231,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device rtc_device = {
+        .name           = "sh-rtc",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(rtc_resources),
+        .resource       = rtc_resources,
+};
+
+static struct platform_device *sh7203_devices[] __initdata = {
+        &sci_device,
+        &rtc_device,
+};
+
+static int __init sh7203_devices_setup(void)
+{
+        return platform_add_devices(sh7203_devices,
+                                    ARRAY_SIZE(sh7203_devices));
+}
+__initcall(sh7203_devices_setup);
+
+void __init plat_irq_setup(void)
+{
+        register_intc_controller(&intc_desc);
+}
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
index bd745aa87222..a564425b905f 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
@@ -167,7 +167,7 @@ static struct intc_mask_reg mask_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc, "sh7206", vectors, groups,
-                         NULL, mask_registers, prio_registers, NULL);
+                         mask_registers, prio_registers, NULL);
 
 static struct plat_sci_port sci_platform_data[] = {
         {
diff --git a/arch/sh/kernel/cpu/sh3/Makefile b/arch/sh/kernel/cpu/sh3/Makefile
index 646eb6933614..3ae4d9111f19 100644
--- a/arch/sh/kernel/cpu/sh3/Makefile
+++ b/arch/sh/kernel/cpu/sh3/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7709)	+= setup-sh770x.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7710)        += setup-sh7710.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7712)        += setup-sh7710.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7720)        += setup-sh7720.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7721)        += setup-sh7720.o
 
 # Primary on-chip clocks (common)
 clock-$(CONFIG_CPU_SH3)                 := clock-sh3.o
@@ -21,5 +22,6 @@ clock-$(CONFIG_CPU_SUBTYPE_SH7706)	:= clock-sh7706.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7709)      := clock-sh7709.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7710)      := clock-sh7710.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7720)      := clock-sh7710.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7712)      := clock-sh7712.o
 
 obj-y   += $(clock-y)
diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7712.c b/arch/sh/kernel/cpu/sh3/clock-sh7712.c
new file mode 100644
index 000000000000..54f54df51ef0
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh3/clock-sh7712.c
@@ -0,0 +1,71 @@
+/*
+ * arch/sh/kernel/cpu/sh3/clock-sh7712.c
+ *
+ * SH7712 support for the clock framework
+ *
+ *  Copyright (C) 2007  Andrew Murray <amurray@mpc-data.co.uk>
+ *
+ * Based on arch/sh/kernel/cpu/sh3/clock-sh3.c
+ *  Copyright (C) 2005  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <asm/clock.h>
+#include <asm/freq.h>
+#include <asm/io.h>
+
+static int multipliers[] = { 1, 2, 3 };
+static int divisors[]    = { 1, 2, 3, 4, 6 };
+
+static void master_clk_init(struct clk *clk)
+{
+        int frqcr = ctrl_inw(FRQCR);
+        int idx = (frqcr & 0x0300) >> 8;
+
+        clk->rate *= multipliers[idx];
+}
+
+static struct clk_ops sh7712_master_clk_ops = {
+        .init           = master_clk_init,
+};
+
+static void module_clk_recalc(struct clk *clk)
+{
+        int frqcr = ctrl_inw(FRQCR);
+        int idx = frqcr & 0x0007;
+
+        clk->rate = clk->parent->rate / divisors[idx];
+}
+
+static struct clk_ops sh7712_module_clk_ops = {
+        .recalc         = module_clk_recalc,
+};
+
+static void cpu_clk_recalc(struct clk *clk)
+{
+        int frqcr = ctrl_inw(FRQCR);
+        int idx = (frqcr & 0x0030) >> 4;
+
+        clk->rate = clk->parent->rate / divisors[idx];
+}
+
+static struct clk_ops sh7712_cpu_clk_ops = {
+        .recalc         = cpu_clk_recalc,
+};
+
+static struct clk_ops *sh7712_clk_ops[] = {
+        &sh7712_master_clk_ops,
+        &sh7712_module_clk_ops,
+        &sh7712_cpu_clk_ops,
+};
+
+void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
+{
+        if (idx < ARRAY_SIZE(sh7712_clk_ops))
+                *ops = sh7712_clk_ops[idx];
+}
+
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S
index 0d12a124055c..4004073f98cd 100644
--- a/arch/sh/kernel/cpu/sh3/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
@@ -13,8 +13,9 @@
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
-#include <asm/cpu/mmu_context.h>
 #include <asm/unistd.h>
+#include <asm/cpu/mmu_context.h>
+#include <asm/page.h>
 
 ! NOTE:
 ! GNU as (as of 2.9.1) changes bf/s into bt/s and bra, when the address
@@ -409,6 +410,27 @@ ENTRY(handle_exception)
         ! Using k0, k1 for scratch registers (r0_bank1, r1_bank),
         ! save all registers onto stack.
         !
+
+#ifdef CONFIG_GUSA
+        ! Check for roll back gRB (User and Kernel)
+        mov     r15, k0
+        shll    k0
+        bf/s    1f
+         shll   k0
+        bf/s    1f
+         stc    spc, k1
+        stc     r0_bank, k0
+        cmp/hs  k0, k1          ! test k1 (saved PC) >= k0 (saved r0)
+        bt/s    2f
+         stc    r1_bank, k1
+
+        add     #-2, k0
+        add     r15, k0
+        ldc     k0, spc         ! PC = saved r0 + r15 - 2
+2:      mov     k1, r15         ! SP = r1
+1:
+#endif
+
         stc     ssr, k0         ! Is it from kernel space?
         shll    k0              ! Check MD bit (bit30) by shifting it into...
         shll    k0              !       ...the T bit
diff --git a/arch/sh/kernel/cpu/sh3/ex.S b/arch/sh/kernel/cpu/sh3/ex.S
index b6abf38d3a8d..11b6d9c6edae 100644
--- a/arch/sh/kernel/cpu/sh3/ex.S
+++ b/arch/sh/kernel/cpu/sh3/ex.S
@@ -36,7 +36,7 @@ ENTRY(exception_handling_table)
         .long   exception_error ! address error store   /* 100 */
 #endif
 #if defined(CONFIG_SH_FPU)
-        .long   do_fpu_error            /* 120 */
+        .long   fpu_error_trap_handler  /* 120 */
 #else
         .long   exception_error         /* 120 */
 #endif
diff --git a/arch/sh/kernel/cpu/sh3/probe.c b/arch/sh/kernel/cpu/sh3/probe.c
index bf579e061e09..fcc80bb7bee7 100644
--- a/arch/sh/kernel/cpu/sh3/probe.c
+++ b/arch/sh/kernel/cpu/sh3/probe.c
@@ -16,11 +16,11 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 
-int __init detect_cpu_and_cache_system(void)
+int __uses_jump_to_uncached detect_cpu_and_cache_system(void)
 {
         unsigned long addr0, addr1, data0, data1, data2, data3;
 
-        jump_to_P2();
+        jump_to_uncached();
         /*
          * Check if the entry shadows or not.
          * When shadowed, it's 128-entry system.
@@ -48,7 +48,7 @@ int __init detect_cpu_and_cache_system(void)
         ctrl_outl(data0&~SH_CACHE_VALID, addr0);
         ctrl_outl(data2&~SH_CACHE_VALID, addr1);
 
-        back_to_P1();
+        back_to_cached();
 
         boot_cpu_data.dcache.ways               = 4;
         boot_cpu_data.dcache.entry_shift        = 4;
@@ -84,6 +84,9 @@ int __init detect_cpu_and_cache_system(void)
 #if defined(CONFIG_CPU_SUBTYPE_SH7720)
                 boot_cpu_data.type = CPU_SH7720;
 #endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7721)
+                boot_cpu_data.type = CPU_SH7721;
+#endif
 #if defined(CONFIG_CPU_SUBTYPE_SH7705)
                 boot_cpu_data.type = CPU_SH7705;
 
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
index f6c65f2659e9..dd0a20a685f7 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
@@ -66,12 +66,6 @@ static struct intc_group groups[] __initdata = {
         INTC_GROUP(SCIF2, SCIF2_ERI, SCIF2_RXI, SCIF2_TXI),
 };
 
-static struct intc_prio priorities[] __initdata = {
-        INTC_PRIO(DMAC, 7),
-        INTC_PRIO(SCIF2, 3),
-        INTC_PRIO(SCIF0, 3),
-};
-
 static struct intc_prio_reg prio_registers[] __initdata = {
         { 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } },
         { 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF_RCMI, 0, 0 } },
@@ -85,7 +79,7 @@ static struct intc_prio_reg prio_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, groups,
-                         priorities, NULL, prio_registers, NULL);
+                         NULL, prio_registers, NULL);
 
 static struct intc_vect vectors_irq[] __initdata = {
         INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620),
@@ -93,7 +87,7 @@ static struct intc_vect vectors_irq[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_irq, "sh7705-irq", vectors_irq, NULL,
-                         priorities, NULL, prio_registers, NULL);
+                         NULL, prio_registers, NULL);
 
 static struct plat_sci_port sci_platform_data[] = {
         {
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
index 60b04b1f9453..969804bb523b 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
@@ -81,13 +81,6 @@ static struct intc_group groups[] __initdata = {
         INTC_GROUP(SCIF2, SCIF2_ERI, SCIF2_RXI, SCIF2_BRI, SCIF2_TXI),
 };
 
-static struct intc_prio priorities[] __initdata = {
-        INTC_PRIO(DMAC, 7),
-        INTC_PRIO(SCI, 3),
-        INTC_PRIO(SCIF2, 3),
-        INTC_PRIO(SCIF0, 3),
-};
-
 static struct intc_prio_reg prio_registers[] __initdata = {
         { 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } },
         { 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF, SCI, 0 } },
@@ -109,7 +102,7 @@ static struct intc_prio_reg prio_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc, "sh770x", vectors, groups,
-                         priorities, NULL, prio_registers, NULL);
+                         NULL, prio_registers, NULL);
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7706) || \
     defined(CONFIG_CPU_SUBTYPE_SH7707) || \
@@ -120,7 +113,7 @@ static struct intc_vect vectors_irq[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_irq, "sh770x-irq", vectors_irq, NULL,
-                         priorities, NULL, prio_registers, NULL);
+                         NULL, prio_registers, NULL);
 #endif
 
 static struct resource rtc_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
index 84e5629fa841..0cc0e2bf135d 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -73,18 +73,6 @@ static struct intc_group groups[] __initdata = {
         INTC_GROUP(SIOF1, SIOF1_ERI, SIOF1_TXI, SIOF1_RXI, SIOF1_CCI),
 };
 
-static struct intc_prio priorities[] __initdata = {
-        INTC_PRIO(DMAC1, 7),
-        INTC_PRIO(DMAC2, 7),
-        INTC_PRIO(SCIF0, 3),
-        INTC_PRIO(SCIF1, 3),
-        INTC_PRIO(SIOF0, 3),
-        INTC_PRIO(SIOF1, 3),
-        INTC_PRIO(EDMAC0, 5),
-        INTC_PRIO(EDMAC1, 5),
-        INTC_PRIO(EDMAC2, 5),
-};
-
 static struct intc_prio_reg prio_registers[] __initdata = {
         { 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } },
         { 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF, 0, 0 } },
@@ -101,7 +89,7 @@ static struct intc_prio_reg prio_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc, "sh7710", vectors, groups,
-                         priorities, NULL, prio_registers, NULL);
+                         NULL, prio_registers, NULL);
 
 static struct intc_vect vectors_irq[] __initdata = {
         INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620),
@@ -109,7 +97,7 @@ static struct intc_vect vectors_irq[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_irq, "sh7710-irq", vectors_irq, NULL,
-                         priorities, NULL, prio_registers, NULL);
+                         NULL, prio_registers, NULL);
 
 static struct resource rtc_resources[] = {
         [0] =   {
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7720.c b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
index a0929b8a95ae..3855ea4c21c8 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7720.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
@@ -85,9 +85,62 @@ static struct platform_device sci_device = {
         },
 };
 
+static struct resource usb_ohci_resources[] = {
+        [0] = {
+                .start  = 0xA4428000,
+                .end    = 0xA44280FF,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 67,
+                .end    = 67,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static u64 usb_ohci_dma_mask = 0xffffffffUL;
+static struct platform_device usb_ohci_device = {
+        .name           = "sh_ohci",
+        .id             = -1,
+        .dev = {
+                .dma_mask               = &usb_ohci_dma_mask,
+                .coherent_dma_mask      = 0xffffffff,
+        },
+        .num_resources  = ARRAY_SIZE(usb_ohci_resources),
+        .resource       = usb_ohci_resources,
+};
+
+static struct resource usbf_resources[] = {
+        [0] = {
+                .name   = "sh_udc",
+                .start  = 0xA4420000,
+                .end    = 0xA44200FF,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .name   = "sh_udc",
+                .start  = 65,
+                .end    = 65,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device usbf_device = {
+        .name           = "sh_udc",
+        .id             = -1,
+        .dev = {
+                .dma_mask               = NULL,
+                .coherent_dma_mask      = 0xffffffff,
+        },
+        .num_resources  = ARRAY_SIZE(usbf_resources),
+        .resource       = usbf_resources,
+};
+
 static struct platform_device *sh7720_devices[] __initdata = {
         &rtc_device,
         &sci_device,
+        &usb_ohci_device,
+        &usbf_device,
 };
 
 static int __init sh7720_devices_setup(void)
@@ -127,8 +180,11 @@ static struct intc_vect vectors[] __initdata = {
         INTC_VECT(USBF_SPD, 0x6e0),   INTC_VECT(DMAC1_DEI0, 0x800),
         INTC_VECT(DMAC1_DEI1, 0x820), INTC_VECT(DMAC1_DEI2, 0x840),
         INTC_VECT(DMAC1_DEI3, 0x860), INTC_VECT(LCDC, 0x900),
-        INTC_VECT(SSL, 0x980),        INTC_VECT(USBFI0, 0xa20),
-        INTC_VECT(USBFI1, 0xa40),     INTC_VECT(USBHI, 0xa60),
+#if defined(CONFIG_CPU_SUBTYPE_SH7720)
+        INTC_VECT(SSL, 0x980),
+#endif
+        INTC_VECT(USBFI0, 0xa20),     INTC_VECT(USBFI1, 0xa40),
+        INTC_VECT(USBHI, 0xa60),
         INTC_VECT(DMAC2_DEI4, 0xb80), INTC_VECT(DMAC2_DEI5, 0xba0),
         INTC_VECT(ADC, 0xbe0),        INTC_VECT(SCIF0, 0xc00),
         INTC_VECT(SCIF1, 0xc20),      INTC_VECT(PINT07, 0xc80),
@@ -153,22 +209,16 @@ static struct intc_group groups[] __initdata = {
         INTC_GROUP(MMC, MMCI0, MMCI1, MMCI2, MMCI3),
 };
 
-static struct intc_prio priorities[] __initdata = {
-        INTC_PRIO(SCIF0, 2),
-        INTC_PRIO(SCIF1, 2),
-        INTC_PRIO(DMAC1, 1),
-        INTC_PRIO(DMAC2, 1),
-        INTC_PRIO(RTC, 2),
-        INTC_PRIO(TMU, 2),
-        INTC_PRIO(TPU, 2),
-};
-
 static struct intc_prio_reg prio_registers[] __initdata = {
         { 0xA414FEE2UL, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } },
         { 0xA414FEE4UL, 0, 16, 4, /* IPRB */ { WDT, REF_RCMI, SIM, 0 } },
         { 0xA4140016UL, 0, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } },
         { 0xA4140018UL, 0, 16, 4, /* IPRD */ { USBF_SPD, TMU_SUNI, IRQ5, IRQ4 } },
+#if defined(CONFIG_CPU_SUBTYPE_SH7720)
         { 0xA414001AUL, 0, 16, 4, /* IPRE */ { DMAC1, 0, LCDC, SSL } },
+#else
+        { 0xA414001AUL, 0, 16, 4, /* IPRE */ { DMAC1, 0, LCDC, 0 } },
+#endif
         { 0xA4080000UL, 0, 16, 4, /* IPRF */ { ADC, DMAC2, USBFI, CMT } },
         { 0xA4080002UL, 0, 16, 4, /* IPRG */ { SCIF0, SCIF1, 0, 0 } },
         { 0xA4080004UL, 0, 16, 4, /* IPRH */ { PINT07, PINT815, TPU, IIC } },
@@ -177,7 +227,7 @@ static struct intc_prio_reg prio_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc, "sh7720", vectors, groups,
-                priorities, NULL, prio_registers, NULL);
+                NULL, prio_registers, NULL);
 
 static struct intc_sense_reg sense_registers[] __initdata = {
         { INTC_ICR1, 16, 2, { 0, 0, IRQ5, IRQ4, IRQ3, IRQ2, IRQ1, IRQ0 } },
@@ -190,7 +240,7 @@ static struct intc_vect vectors_irq[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_irq_desc, "sh7720-irq", vectors_irq,
-                NULL, priorities, NULL, prio_registers, sense_registers);
+                NULL, NULL, prio_registers, sense_registers);
 
 void __init plat_irq_setup_pins(int mode)
 {
diff --git a/arch/sh/kernel/cpu/sh4/Makefile b/arch/sh/kernel/cpu/sh4/Makefile
index dadd6bffc128..d608557c7a3f 100644
--- a/arch/sh/kernel/cpu/sh4/Makefile
+++ b/arch/sh/kernel/cpu/sh4/Makefile
@@ -5,7 +5,7 @@
 obj-y   := probe.o common.o
 common-y        += $(addprefix ../sh3/, entry.o ex.o)
 
-obj-$(CONFIG_SH_FPU)                    += fpu.o
+obj-$(CONFIG_SH_FPU)                    += fpu.o softfloat.o
 obj-$(CONFIG_SH_STORE_QUEUES)           += sq.o
 
 # CPU subtype setup
diff --git a/arch/sh/kernel/cpu/sh4/fpu.c b/arch/sh/kernel/cpu/sh4/fpu.c
index c5a4fc77fa06..817f9939cda6 100644
--- a/arch/sh/kernel/cpu/sh4/fpu.c
+++ b/arch/sh/kernel/cpu/sh4/fpu.c
@@ -1,7 +1,4 @@
-/* $Id: fpu.c,v 1.4 2004/01/13 05:52:11 kkojima Exp $
- *
- * linux/arch/sh/kernel/fpu.c
- *
+/*
  * Save/restore floating point context for signal handlers.
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -9,15 +6,16 @@
  * for more details.
  *
  * Copyright (C) 1999, 2000  Kaz Kojima & Niibe Yutaka
+ * Copyright (C) 2006  ST Microelectronics Ltd. (denorm support)
  *
- * FIXME! These routines can be optimized in big endian case.
+ * FIXME! These routines have not been tested for big endian case.
  */
-
 #include <linux/sched.h>
 #include <linux/signal.h>
+#include <linux/io.h>
+#include <asm/cpu/fpu.h>
 #include <asm/processor.h>
 #include <asm/system.h>
-#include <asm/io.h>
 
 /* The PR (precision) bit in the FP Status Register must be clear when
  * an frchg instruction is executed, otherwise the instruction is undefined.
@@ -25,177 +23,184 @@
  */
 
 #define FPSCR_RCHG 0x00000000
+extern unsigned long long float64_div(unsigned long long a,
+                                      unsigned long long b);
+extern unsigned long int float32_div(unsigned long int a, unsigned long int b);
+extern unsigned long long float64_mul(unsigned long long a,
+                                      unsigned long long b);
+extern unsigned long int float32_mul(unsigned long int a, unsigned long int b);
+extern unsigned long long float64_add(unsigned long long a,
+                                      unsigned long long b);
+extern unsigned long int float32_add(unsigned long int a, unsigned long int b);
+extern unsigned long long float64_sub(unsigned long long a,
+                                      unsigned long long b);
+extern unsigned long int float32_sub(unsigned long int a, unsigned long int b);
 
+static unsigned int fpu_exception_flags;
 
 /*
  * Save FPU registers onto task structure.
  * Assume called with FPU enabled (SR.FD=0).
  */
-void
-save_fpu(struct task_struct *tsk, struct pt_regs *regs)
+void save_fpu(struct task_struct *tsk, struct pt_regs *regs)
 {
         unsigned long dummy;
 
         clear_tsk_thread_flag(tsk, TIF_USEDFPU);
         enable_fpu();
-        asm volatile("sts.l     fpul, @-%0\n\t"
-                     "sts.l     fpscr, @-%0\n\t"
-                     "lds       %2, fpscr\n\t"
-                     "frchg\n\t"
-                     "fmov.s    fr15, @-%0\n\t"
-                     "fmov.s    fr14, @-%0\n\t"
-                     "fmov.s    fr13, @-%0\n\t"
-                     "fmov.s    fr12, @-%0\n\t"
-                     "fmov.s    fr11, @-%0\n\t"
-                     "fmov.s    fr10, @-%0\n\t"
-                     "fmov.s    fr9, @-%0\n\t"
-                     "fmov.s    fr8, @-%0\n\t"
-                     "fmov.s    fr7, @-%0\n\t"
-                     "fmov.s    fr6, @-%0\n\t"
-                     "fmov.s    fr5, @-%0\n\t"
-                     "fmov.s    fr4, @-%0\n\t"
-                     "fmov.s    fr3, @-%0\n\t"
-                     "fmov.s    fr2, @-%0\n\t"
-                     "fmov.s    fr1, @-%0\n\t"
-                     "fmov.s    fr0, @-%0\n\t"
-                     "frchg\n\t"
-                     "fmov.s    fr15, @-%0\n\t"
-                     "fmov.s    fr14, @-%0\n\t"
-                     "fmov.s    fr13, @-%0\n\t"
-                     "fmov.s    fr12, @-%0\n\t"
-                     "fmov.s    fr11, @-%0\n\t"
-                     "fmov.s    fr10, @-%0\n\t"
-                     "fmov.s    fr9, @-%0\n\t"
-                     "fmov.s    fr8, @-%0\n\t"
-                     "fmov.s    fr7, @-%0\n\t"
-                     "fmov.s    fr6, @-%0\n\t"
-                     "fmov.s    fr5, @-%0\n\t"
-                     "fmov.s    fr4, @-%0\n\t"
-                     "fmov.s    fr3, @-%0\n\t"
-                     "fmov.s    fr2, @-%0\n\t"
-                     "fmov.s    fr1, @-%0\n\t"
-                     "fmov.s    fr0, @-%0\n\t"
-                     "lds       %3, fpscr\n\t"
-                     : "=r" (dummy)
-                     : "0" ((char *)(&tsk->thread.fpu.hard.status)),
-                       "r" (FPSCR_RCHG),
-                       "r" (FPSCR_INIT)
-                     : "memory");
-
-        disable_fpu();
-        release_fpu(regs);
+        asm volatile ("sts.l    fpul, @-%0\n\t"
+                      "sts.l    fpscr, @-%0\n\t"
+                      "lds      %2, fpscr\n\t"
+                      "frchg\n\t"
+                      "fmov.s   fr15, @-%0\n\t"
+                      "fmov.s   fr14, @-%0\n\t"
+                      "fmov.s   fr13, @-%0\n\t"
+                      "fmov.s   fr12, @-%0\n\t"
+                      "fmov.s   fr11, @-%0\n\t"
+                      "fmov.s   fr10, @-%0\n\t"
+                      "fmov.s   fr9, @-%0\n\t"
+                      "fmov.s   fr8, @-%0\n\t"
+                      "fmov.s   fr7, @-%0\n\t"
+                      "fmov.s   fr6, @-%0\n\t"
+                      "fmov.s   fr5, @-%0\n\t"
+                      "fmov.s   fr4, @-%0\n\t"
+                      "fmov.s   fr3, @-%0\n\t"
+                      "fmov.s   fr2, @-%0\n\t"
+                      "fmov.s   fr1, @-%0\n\t"
+                      "fmov.s   fr0, @-%0\n\t"
+                      "frchg\n\t"
+                      "fmov.s   fr15, @-%0\n\t"
+                      "fmov.s   fr14, @-%0\n\t"
+                      "fmov.s   fr13, @-%0\n\t"
+                      "fmov.s   fr12, @-%0\n\t"
+                      "fmov.s   fr11, @-%0\n\t"
+                      "fmov.s   fr10, @-%0\n\t"
+                      "fmov.s   fr9, @-%0\n\t"
+                      "fmov.s   fr8, @-%0\n\t"
+                      "fmov.s   fr7, @-%0\n\t"
+                      "fmov.s   fr6, @-%0\n\t"
+                      "fmov.s   fr5, @-%0\n\t"
+                      "fmov.s   fr4, @-%0\n\t"
+                      "fmov.s   fr3, @-%0\n\t"
+                      "fmov.s   fr2, @-%0\n\t"
+                      "fmov.s   fr1, @-%0\n\t"
+                      "fmov.s   fr0, @-%0\n\t"
+                      "lds      %3, fpscr\n\t":"=r" (dummy)
+                      :"0"((char *)(&tsk->thread.fpu.hard.status)),
+                      "r"(FPSCR_RCHG), "r"(FPSCR_INIT)
+                      :"memory");
+
+        disable_fpu();
+        release_fpu(regs);
 }
 
-static void
-restore_fpu(struct task_struct *tsk)
+static void restore_fpu(struct task_struct *tsk)
 {
         unsigned long dummy;
 
-        enable_fpu();
-        asm volatile("lds       %2, fpscr\n\t"
-                     "fmov.s    @%0+, fr0\n\t"
-                     "fmov.s    @%0+, fr1\n\t"
-                     "fmov.s    @%0+, fr2\n\t"
-                     "fmov.s    @%0+, fr3\n\t"
-                     "fmov.s    @%0+, fr4\n\t"
-                     "fmov.s    @%0+, fr5\n\t"
-                     "fmov.s    @%0+, fr6\n\t"
-                     "fmov.s    @%0+, fr7\n\t"
-                     "fmov.s    @%0+, fr8\n\t"
-                     "fmov.s    @%0+, fr9\n\t"
-                     "fmov.s    @%0+, fr10\n\t"
-                     "fmov.s    @%0+, fr11\n\t"
-                     "fmov.s    @%0+, fr12\n\t"
-                     "fmov.s    @%0+, fr13\n\t"
-                     "fmov.s    @%0+, fr14\n\t"
-                     "fmov.s    @%0+, fr15\n\t"
-                     "frchg\n\t"
-                     "fmov.s    @%0+, fr0\n\t"
-                     "fmov.s    @%0+, fr1\n\t"
-                     "fmov.s    @%0+, fr2\n\t"
-                     "fmov.s    @%0+, fr3\n\t"
-                     "fmov.s    @%0+, fr4\n\t"
-                     "fmov.s    @%0+, fr5\n\t"
-                     "fmov.s    @%0+, fr6\n\t"
-                     "fmov.s    @%0+, fr7\n\t"
-                     "fmov.s    @%0+, fr8\n\t"
-                     "fmov.s    @%0+, fr9\n\t"
-                     "fmov.s    @%0+, fr10\n\t"
-                     "fmov.s    @%0+, fr11\n\t"
-                     "fmov.s    @%0+, fr12\n\t"
-                     "fmov.s    @%0+, fr13\n\t"
-                     "fmov.s    @%0+, fr14\n\t"
-                     "fmov.s    @%0+, fr15\n\t"
-                     "frchg\n\t"
-                     "lds.l     @%0+, fpscr\n\t"
-                     "lds.l     @%0+, fpul\n\t"
-                     : "=r" (dummy)
-                     : "0" (&tsk->thread.fpu), "r" (FPSCR_RCHG)
-                     : "memory");
+        enable_fpu();
+        asm volatile ("lds      %2, fpscr\n\t"
+                      "fmov.s   @%0+, fr0\n\t"
+                      "fmov.s   @%0+, fr1\n\t"
+                      "fmov.s   @%0+, fr2\n\t"
+                      "fmov.s   @%0+, fr3\n\t"
+                      "fmov.s   @%0+, fr4\n\t"
+                      "fmov.s   @%0+, fr5\n\t"
+                      "fmov.s   @%0+, fr6\n\t"
+                      "fmov.s   @%0+, fr7\n\t"
+                      "fmov.s   @%0+, fr8\n\t"
+                      "fmov.s   @%0+, fr9\n\t"
+                      "fmov.s   @%0+, fr10\n\t"
+                      "fmov.s   @%0+, fr11\n\t"
+                      "fmov.s   @%0+, fr12\n\t"
+                      "fmov.s   @%0+, fr13\n\t"
+                      "fmov.s   @%0+, fr14\n\t"
+                      "fmov.s   @%0+, fr15\n\t"
+                      "frchg\n\t"
+                      "fmov.s   @%0+, fr0\n\t"
+                      "fmov.s   @%0+, fr1\n\t"
+                      "fmov.s   @%0+, fr2\n\t"
+                      "fmov.s   @%0+, fr3\n\t"
+                      "fmov.s   @%0+, fr4\n\t"
+                      "fmov.s   @%0+, fr5\n\t"
+                      "fmov.s   @%0+, fr6\n\t"
+                      "fmov.s   @%0+, fr7\n\t"
+                      "fmov.s   @%0+, fr8\n\t"
+                      "fmov.s   @%0+, fr9\n\t"
+                      "fmov.s   @%0+, fr10\n\t"
+                      "fmov.s   @%0+, fr11\n\t"
+                      "fmov.s   @%0+, fr12\n\t"
+                      "fmov.s   @%0+, fr13\n\t"
+                      "fmov.s   @%0+, fr14\n\t"
+                      "fmov.s   @%0+, fr15\n\t"
+                      "frchg\n\t"
+                      "lds.l    @%0+, fpscr\n\t"
+                      "lds.l    @%0+, fpul\n\t"
+                      :"=r" (dummy)
+                      :"0"(&tsk->thread.fpu), "r"(FPSCR_RCHG)
+                      :"memory");
         disable_fpu();
 }
 
 /*
  * Load the FPU with signalling NANS.  This bit pattern we're using
  * has the property that no matter wether considered as single or as
- * double precision represents signaling NANS.  
+ * double precision represents signaling NANS.
  */
 
-static void
-fpu_init(void)
+static void fpu_init(void)
 {
         enable_fpu();
-        asm volatile("lds       %0, fpul\n\t"
-                     "lds       %1, fpscr\n\t"
-                     "fsts      fpul, fr0\n\t"
-                     "fsts      fpul, fr1\n\t"
-                     "fsts      fpul, fr2\n\t"
-                     "fsts      fpul, fr3\n\t"
-                     "fsts      fpul, fr4\n\t"
-                     "fsts      fpul, fr5\n\t"
-                     "fsts      fpul, fr6\n\t"
-                     "fsts      fpul, fr7\n\t"
-                     "fsts      fpul, fr8\n\t"
-                     "fsts      fpul, fr9\n\t"
-                     "fsts      fpul, fr10\n\t"
-                     "fsts      fpul, fr11\n\t"
-                     "fsts      fpul, fr12\n\t"
-                     "fsts      fpul, fr13\n\t"
-                     "fsts      fpul, fr14\n\t"
-                     "fsts      fpul, fr15\n\t"
-                     "frchg\n\t"
-                     "fsts      fpul, fr0\n\t"
-                     "fsts      fpul, fr1\n\t"
-                     "fsts      fpul, fr2\n\t"
-                     "fsts      fpul, fr3\n\t"
-                     "fsts      fpul, fr4\n\t"
-                     "fsts      fpul, fr5\n\t"
-                     "fsts      fpul, fr6\n\t"
-                     "fsts      fpul, fr7\n\t"
-                     "fsts      fpul, fr8\n\t"
-                     "fsts      fpul, fr9\n\t"
-                     "fsts      fpul, fr10\n\t"
-                     "fsts      fpul, fr11\n\t"
-                     "fsts      fpul, fr12\n\t"
-                     "fsts      fpul, fr13\n\t"
-                     "fsts      fpul, fr14\n\t"
-                     "fsts      fpul, fr15\n\t"
-                     "frchg\n\t"
-                     "lds       %2, fpscr\n\t"
-                     : /* no output */
-                     : "r" (0), "r" (FPSCR_RCHG), "r" (FPSCR_INIT));
-        disable_fpu();
+        asm volatile (  "lds    %0, fpul\n\t"
+                        "lds    %1, fpscr\n\t"
+                        "fsts   fpul, fr0\n\t"
+                        "fsts   fpul, fr1\n\t"
+                        "fsts   fpul, fr2\n\t"
+                        "fsts   fpul, fr3\n\t"
+                        "fsts   fpul, fr4\n\t"
+                        "fsts   fpul, fr5\n\t"
+                        "fsts   fpul, fr6\n\t"
+                        "fsts   fpul, fr7\n\t"
+                        "fsts   fpul, fr8\n\t"
+                        "fsts   fpul, fr9\n\t"
+                        "fsts   fpul, fr10\n\t"
+                        "fsts   fpul, fr11\n\t"
+                        "fsts   fpul, fr12\n\t"
+                        "fsts   fpul, fr13\n\t"
+                        "fsts   fpul, fr14\n\t"
+                        "fsts   fpul, fr15\n\t"
+                        "frchg\n\t"
+                        "fsts   fpul, fr0\n\t"
+                        "fsts   fpul, fr1\n\t"
+                        "fsts   fpul, fr2\n\t"
+                        "fsts   fpul, fr3\n\t"
+                        "fsts   fpul, fr4\n\t"
+                        "fsts   fpul, fr5\n\t"
+                        "fsts   fpul, fr6\n\t"
+                        "fsts   fpul, fr7\n\t"
+                        "fsts   fpul, fr8\n\t"
+                        "fsts   fpul, fr9\n\t"
+                        "fsts   fpul, fr10\n\t"
+                        "fsts   fpul, fr11\n\t"
+                        "fsts   fpul, fr12\n\t"
+                        "fsts   fpul, fr13\n\t"
+                        "fsts   fpul, fr14\n\t"
+                        "fsts   fpul, fr15\n\t"
+                        "frchg\n\t"
+                        "lds    %2, fpscr\n\t"
+                        :       /* no output */
+                        :"r" (0), "r"(FPSCR_RCHG), "r"(FPSCR_INIT));
+        disable_fpu();
 }
 
 /**
- *      denormal_to_double - Given denormalized float number,
- *                           store double float
+ *      denormal_to_double - Given denormalized float number,
+ *                           store double float
  *
- *      @fpu: Pointer to sh_fpu_hard structure
- *      @n: Index to FP register
+ *      @fpu: Pointer to sh_fpu_hard structure
+ *      @n: Index to FP register
  */
-static void
-denormal_to_double (struct sh_fpu_hard_struct *fpu, int n)
+static void denormal_to_double(struct sh_fpu_hard_struct *fpu, int n)
 {
         unsigned long du, dl;
         unsigned long x = fpu->fpul;
@@ -212,7 +217,7 @@ denormal_to_double (struct sh_fpu_hard_struct *fpu, int n)
                 dl = x << 29;
 
                 fpu->fp_regs[n] = du;
-                fpu->fp_regs[n+1] = dl;
+                fpu->fp_regs[n + 1] = dl;
         }
 }
 
@@ -223,68 +228,191 @@ denormal_to_double (struct sh_fpu_hard_struct *fpu, int n)
  *
  *      Returns 1 when it's handled (should not cause exception).
  */
-static int
-ieee_fpe_handler (struct pt_regs *regs)
+static int ieee_fpe_handler(struct pt_regs *regs)
 {
-        unsigned short insn = *(unsigned short *) regs->pc;
+        unsigned short insn = *(unsigned short *)regs->pc;
         unsigned short finsn;
         unsigned long nextpc;
         int nib[4] = {
                 (insn >> 12) & 0xf,
                 (insn >> 8) & 0xf,
                 (insn >> 4) & 0xf,
-                insn & 0xf};
-
-        if (nib[0] == 0xb ||
-            (nib[0] == 0x4 && nib[2] == 0x0 && nib[3] == 0xb)) /* bsr & jsr */
-                regs->pr = regs->pc + 4;
-  
-        if (nib[0] == 0xa || nib[0] == 0xb) { /* bra & bsr */
-                nextpc = regs->pc + 4 + ((short) ((insn & 0xfff) << 4) >> 3);
-                finsn = *(unsigned short *) (regs->pc + 2);
-        } else if (nib[0] == 0x8 && nib[1] == 0xd) { /* bt/s */
+                insn & 0xf
+        };
+
+        if (nib[0] == 0xb || (nib[0] == 0x4 && nib[2] == 0x0 && nib[3] == 0xb))
+                regs->pr = regs->pc + 4;  /* bsr & jsr */
+
+        if (nib[0] == 0xa || nib[0] == 0xb) {
+                /* bra & bsr */
+                nextpc = regs->pc + 4 + ((short)((insn & 0xfff) << 4) >> 3);
+                finsn = *(unsigned short *)(regs->pc + 2);
+        } else if (nib[0] == 0x8 && nib[1] == 0xd) {
+                /* bt/s */
                 if (regs->sr & 1)
-                        nextpc = regs->pc + 4 + ((char) (insn & 0xff) << 1);
+                        nextpc = regs->pc + 4 + ((char)(insn & 0xff) << 1);
                 else
                         nextpc = regs->pc + 4;
-                finsn = *(unsigned short *) (regs->pc + 2);
-        } else if (nib[0] == 0x8 && nib[1] == 0xf) { /* bf/s */
+                finsn = *(unsigned short *)(regs->pc + 2);
+        } else if (nib[0] == 0x8 && nib[1] == 0xf) {
+                /* bf/s */
                 if (regs->sr & 1)
                         nextpc = regs->pc + 4;
                 else
-                        nextpc = regs->pc + 4 + ((char) (insn & 0xff) << 1);
-                finsn = *(unsigned short *) (regs->pc + 2);
+                        nextpc = regs->pc + 4 + ((char)(insn & 0xff) << 1);
+                finsn = *(unsigned short *)(regs->pc + 2);
         } else if (nib[0] == 0x4 && nib[3] == 0xb &&
-                 (nib[2] == 0x0 || nib[2] == 0x2)) { /* jmp & jsr */
+                   (nib[2] == 0x0 || nib[2] == 0x2)) {
+                /* jmp & jsr */
                 nextpc = regs->regs[nib[1]];
-                finsn = *(unsigned short *) (regs->pc + 2);
+                finsn = *(unsigned short *)(regs->pc + 2);
         } else if (nib[0] == 0x0 && nib[3] == 0x3 &&
-                 (nib[2] == 0x0 || nib[2] == 0x2)) { /* braf & bsrf */
+                   (nib[2] == 0x0 || nib[2] == 0x2)) {
+                /* braf & bsrf */
                 nextpc = regs->pc + 4 + regs->regs[nib[1]];
-                finsn = *(unsigned short *) (regs->pc + 2);
-        } else if (insn == 0x000b) { /* rts */
+                finsn = *(unsigned short *)(regs->pc + 2);
+        } else if (insn == 0x000b) {
+                /* rts */
                 nextpc = regs->pr;
-                finsn = *(unsigned short *) (regs->pc + 2);
+                finsn = *(unsigned short *)(regs->pc + 2);
         } else {
                 nextpc = regs->pc + instruction_size(insn);
                 finsn = insn;
         }
 
-        if ((finsn & 0xf1ff) == 0xf0ad) { /* fcnvsd */
+        if ((finsn & 0xf1ff) == 0xf0ad) {
+                /* fcnvsd */
                 struct task_struct *tsk = current;
 
                 save_fpu(tsk, regs);
-                if ((tsk->thread.fpu.hard.fpscr & (1 << 17))) {
+                if ((tsk->thread.fpu.hard.fpscr & FPSCR_CAUSE_ERROR))
                         /* FPU error */
-                        denormal_to_double (&tsk->thread.fpu.hard,
-                                            (finsn >> 8) & 0xf);
-                        tsk->thread.fpu.hard.fpscr &=
-                                ~(FPSCR_CAUSE_MASK | FPSCR_FLAG_MASK);
-                        grab_fpu(regs);
-                        restore_fpu(tsk);
-                        set_tsk_thread_flag(tsk, TIF_USEDFPU);
+                        denormal_to_double(&tsk->thread.fpu.hard,
+                                           (finsn >> 8) & 0xf);
+                else
+                        return 0;
+
+                regs->pc = nextpc;
+                return 1;
+        } else if ((finsn & 0xf00f) == 0xf002) {
+                /* fmul */
+                struct task_struct *tsk = current;
+                int fpscr;
+                int n, m, prec;
+                unsigned int hx, hy;
+
+                n = (finsn >> 8) & 0xf;
+                m = (finsn >> 4) & 0xf;
+                hx = tsk->thread.fpu.hard.fp_regs[n];
+                hy = tsk->thread.fpu.hard.fp_regs[m];
+                fpscr = tsk->thread.fpu.hard.fpscr;
+                prec = fpscr & FPSCR_DBL_PRECISION;
+
+                if ((fpscr & FPSCR_CAUSE_ERROR)
+                    && (prec && ((hx & 0x7fffffff) < 0x00100000
+                                 || (hy & 0x7fffffff) < 0x00100000))) {
+                        long long llx, lly;
+
+                        /* FPU error because of denormal (doubles) */
+                        llx = ((long long)hx << 32)
+                            | tsk->thread.fpu.hard.fp_regs[n + 1];
+                        lly = ((long long)hy << 32)
+                            | tsk->thread.fpu.hard.fp_regs[m + 1];
+                        llx = float64_mul(llx, lly);
+                        tsk->thread.fpu.hard.fp_regs[n] = llx >> 32;
+                        tsk->thread.fpu.hard.fp_regs[n + 1] = llx & 0xffffffff;
+                } else if ((fpscr & FPSCR_CAUSE_ERROR)
+                           && (!prec && ((hx & 0x7fffffff) < 0x00800000
+                                         || (hy & 0x7fffffff) < 0x00800000))) {
+                        /* FPU error because of denormal (floats) */
+                        hx = float32_mul(hx, hy);
+                        tsk->thread.fpu.hard.fp_regs[n] = hx;
+                } else
+                        return 0;
+
+                regs->pc = nextpc;
+                return 1;
+        } else if ((finsn & 0xf00e) == 0xf000) {
+                /* fadd, fsub */
+                struct task_struct *tsk = current;
+                int fpscr;
+                int n, m, prec;
+                unsigned int hx, hy;
+
+                n = (finsn >> 8) & 0xf;
+                m = (finsn >> 4) & 0xf;
+                hx = tsk->thread.fpu.hard.fp_regs[n];
+                hy = tsk->thread.fpu.hard.fp_regs[m];
+                fpscr = tsk->thread.fpu.hard.fpscr;
+                prec = fpscr & FPSCR_DBL_PRECISION;
+
+                if ((fpscr & FPSCR_CAUSE_ERROR)
+                    && (prec && ((hx & 0x7fffffff) < 0x00100000
+                                 || (hy & 0x7fffffff) < 0x00100000))) {
+                        long long llx, lly;
+
+                        /* FPU error because of denormal (doubles) */
+                        llx = ((long long)hx << 32)
+                            | tsk->thread.fpu.hard.fp_regs[n + 1];
+                        lly = ((long long)hy << 32)
+                            | tsk->thread.fpu.hard.fp_regs[m + 1];
+                        if ((finsn & 0xf00f) == 0xf000)
+                                llx = float64_add(llx, lly);
+                        else
+                                llx = float64_sub(llx, lly);
+                        tsk->thread.fpu.hard.fp_regs[n] = llx >> 32;
+                        tsk->thread.fpu.hard.fp_regs[n + 1] = llx & 0xffffffff;
+                } else if ((fpscr & FPSCR_CAUSE_ERROR)
+                           && (!prec && ((hx & 0x7fffffff) < 0x00800000
+                                         || (hy & 0x7fffffff) < 0x00800000))) {
+                        /* FPU error because of denormal (floats) */
+                        if ((finsn & 0xf00f) == 0xf000)
+                                hx = float32_add(hx, hy);
+                        else
+                                hx = float32_sub(hx, hy);
+                        tsk->thread.fpu.hard.fp_regs[n] = hx;
+                } else
+                        return 0;
+
+                regs->pc = nextpc;
+                return 1;
+        } else if ((finsn & 0xf003) == 0xf003) {
+                /* fdiv */
+                struct task_struct *tsk = current;
+                int fpscr;
+                int n, m, prec;
+                unsigned int hx, hy;
+
+                n = (finsn >> 8) & 0xf;
+                m = (finsn >> 4) & 0xf;
+                hx = tsk->thread.fpu.hard.fp_regs[n];
+                hy = tsk->thread.fpu.hard.fp_regs[m];
+                fpscr = tsk->thread.fpu.hard.fpscr;
+                prec = fpscr & FPSCR_DBL_PRECISION;
+
+                if ((fpscr & FPSCR_CAUSE_ERROR)
+                    && (prec && ((hx & 0x7fffffff) < 0x00100000
+                                 || (hy & 0x7fffffff) < 0x00100000))) {
+                        long long llx, lly;
+
+                        /* FPU error because of denormal (doubles) */
+                        llx = ((long long)hx << 32)
+                            | tsk->thread.fpu.hard.fp_regs[n + 1];
+                        lly = ((long long)hy << 32)
+                            | tsk->thread.fpu.hard.fp_regs[m + 1];
+
+                        llx = float64_div(llx, lly);
+
+                        tsk->thread.fpu.hard.fp_regs[n] = llx >> 32;
+                        tsk->thread.fpu.hard.fp_regs[n + 1] = llx & 0xffffffff;
+                } else if ((fpscr & FPSCR_CAUSE_ERROR)
+                           && (!prec && ((hx & 0x7fffffff) < 0x00800000
+                                         || (hy & 0x7fffffff) < 0x00800000))) {
+                        /* FPU error because of denormal (floats) */
+                        hx = float32_div(hx, hy);
+                        tsk->thread.fpu.hard.fp_regs[n] = hx;
                 } else
-                        force_sig(SIGFPE, tsk);
+                        return 0;
 
                 regs->pc = nextpc;
                 return 1;
@@ -293,27 +421,48 @@ ieee_fpe_handler (struct pt_regs *regs)
         return 0;
 }
 
-asmlinkage void
-do_fpu_error(unsigned long r4, unsigned long r5, unsigned long r6,
-             unsigned long r7, struct pt_regs __regs)
+void float_raise(unsigned int flags)
+{
+        fpu_exception_flags |= flags;
+}
+
+int float_rounding_mode(void)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         struct task_struct *tsk = current;
+        int roundingMode = FPSCR_ROUNDING_MODE(tsk->thread.fpu.hard.fpscr);
+        return roundingMode;
+}
 
-        if (ieee_fpe_handler(regs))
-                return;
+BUILD_TRAP_HANDLER(fpu_error)
+{
+        struct task_struct *tsk = current;
+        TRAP_HANDLER_DECL;
 
-        regs->pc += 2;
         save_fpu(tsk, regs);
+        fpu_exception_flags = 0;
+        if (ieee_fpe_handler(regs)) {
+                tsk->thread.fpu.hard.fpscr &=
+                    ~(FPSCR_CAUSE_MASK | FPSCR_FLAG_MASK);
+                tsk->thread.fpu.hard.fpscr |= fpu_exception_flags;
+                /* Set the FPSCR flag as well as cause bits - simply
+                 * replicate the cause */
+                tsk->thread.fpu.hard.fpscr |= (fpu_exception_flags >> 10);
+                grab_fpu(regs);
+                restore_fpu(tsk);
+                set_tsk_thread_flag(tsk, TIF_USEDFPU);
+                if ((((tsk->thread.fpu.hard.fpscr & FPSCR_ENABLE_MASK) >> 7) &
+                     (fpu_exception_flags >> 2)) == 0) {
+                        return;
+                }
+        }
+
         force_sig(SIGFPE, tsk);
 }
 
-asmlinkage void
-do_fpu_state_restore(unsigned long r4, unsigned long r5, unsigned long r6,
-                     unsigned long r7, struct pt_regs __regs)
+BUILD_TRAP_HANDLER(fpu_state_restore)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         struct task_struct *tsk = current;
+        TRAP_HANDLER_DECL;
 
         grab_fpu(regs);
         if (!user_mode(regs)) {
@@ -324,7 +473,7 @@ do_fpu_state_restore(unsigned long r4, unsigned long r5, unsigned long r6,
         if (used_math()) {
                 /* Using the FPU again.  */
                 restore_fpu(tsk);
-        } else  {
+        } else {
                 /* First time FPU user.  */
                 fpu_init();
                 set_used_math();
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index bc9c28a69bf1..f2b9238cda04 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -98,6 +98,8 @@ int __init detect_cpu_and_cache_system(void)
         case 0x200A:
                 if (prr == 0x61)
                         boot_cpu_data.type = CPU_SH7781;
+                else if (prr == 0xa1)
+                        boot_cpu_data.type = CPU_SH7763;
                 else
                         boot_cpu_data.type = CPU_SH7780;
 
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
index 523f68a9ce0e..ae3603aca615 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -126,12 +126,6 @@ static struct intc_group groups[] __initdata = {
         INTC_GROUP(REF, REF_RCMI, REF_ROVI),
 };
 
-static struct intc_prio priorities[] __initdata = {
-        INTC_PRIO(SCIF, 3),
-        INTC_PRIO(SCI1, 3),
-        INTC_PRIO(DMAC, 7),
-};
-
 static struct intc_prio_reg prio_registers[] __initdata = {
         { 0xffd00004, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } },
         { 0xffd00008, 0, 16, 4, /* IPRB */ { WDT, REF, SCI1, 0 } },
@@ -143,7 +137,7 @@ static struct intc_prio_reg prio_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc, "sh7750", vectors, groups,
-                         priorities, NULL, prio_registers, NULL);
+                         NULL, prio_registers, NULL);
 
 /* SH7750, SH7750S, SH7751 and SH7091 all have 4-channel DMA controllers */
 #if defined(CONFIG_CPU_SUBTYPE_SH7750) || \
@@ -163,7 +157,7 @@ static struct intc_group groups_dma4[] __initdata = {
 
 static DECLARE_INTC_DESC(intc_desc_dma4, "sh7750_dma4",
                          vectors_dma4, groups_dma4,
-                         priorities, NULL, prio_registers, NULL);
+                         NULL, prio_registers, NULL);
 #endif
 
 /* SH7750R and SH7751R both have 8-channel DMA controllers */
@@ -184,7 +178,7 @@ static struct intc_group groups_dma8[] __initdata = {
 
 static DECLARE_INTC_DESC(intc_desc_dma8, "sh7750_dma8",
                          vectors_dma8, groups_dma8,
-                         priorities, NULL, prio_registers, NULL);
+                         NULL, prio_registers, NULL);
 #endif
 
 /* SH7750R, SH7751 and SH7751R all have two extra timer channels */
@@ -205,7 +199,7 @@ static struct intc_mask_reg mask_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_tmu34, "sh7750_tmu34",
-                         vectors_tmu34, NULL, priorities,
+                         vectors_tmu34, NULL,
                          mask_registers, prio_registers, NULL);
 #endif
 
@@ -216,7 +210,7 @@ static struct intc_vect vectors_irlm[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_irlm, "sh7750_irlm", vectors_irlm, NULL,
-                         priorities, NULL, prio_registers, NULL);
+                         NULL, prio_registers, NULL);
 
 /* SH7751 and SH7751R both have PCI */
 #if defined(CONFIG_CPU_SUBTYPE_SH7751) || defined(CONFIG_CPU_SUBTYPE_SH7751R)
@@ -233,7 +227,7 @@ static struct intc_group groups_pci[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_pci, "sh7750_pci", vectors_pci, groups_pci,
-                         priorities, mask_registers, prio_registers, NULL);
+                         mask_registers, prio_registers, NULL);
 #endif
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7750) || \
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
index 7a898cb1d940..85f81579b97e 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
@@ -92,15 +92,6 @@ static struct intc_group groups[] __initdata = {
         INTC_GROUP(REF, REF_RCMI, REF_ROVI),
 };
 
-static struct intc_prio priorities[] __initdata = {
-        INTC_PRIO(SCIF0, 3),
-        INTC_PRIO(SCIF1, 3),
-        INTC_PRIO(SCIF2, 3),
-        INTC_PRIO(SIM, 3),
-        INTC_PRIO(DMAC, 7),
-        INTC_PRIO(DMABRG, 13),
-};
-
 static struct intc_mask_reg mask_registers[] __initdata = {
         { 0xfe080040, 0xfe080060, 32, /* INTMSK00 / INTMSKCLR00 */
           { IRQ4, IRQ5, IRQ6, IRQ7, 0, 0, HCAN20, HCAN21,
@@ -132,7 +123,7 @@ static struct intc_prio_reg prio_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc, "sh7760", vectors, groups,
-                         priorities, mask_registers, prio_registers, NULL);
+                         mask_registers, prio_registers, NULL);
 
 static struct intc_vect vectors_irq[] __initdata = {
         INTC_VECT(IRL0, 0x240), INTC_VECT(IRL1, 0x2a0),
@@ -140,7 +131,7 @@ static struct intc_vect vectors_irq[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_irq, "sh7760-irq", vectors_irq, groups,
-                         priorities, mask_registers, prio_registers, NULL);
+                         mask_registers, prio_registers, NULL);
 
 static struct plat_sci_port sci_platform_data[] = {
         {
diff --git a/arch/sh/kernel/cpu/sh4/softfloat.c b/arch/sh/kernel/cpu/sh4/softfloat.c
new file mode 100644
index 000000000000..7b2d337ee412
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4/softfloat.c
@@ -0,0 +1,892 @@
+/*
+ * Floating point emulation support for subnormalised numbers on SH4
+ * architecture This file is derived from the SoftFloat IEC/IEEE
+ * Floating-point Arithmetic Package, Release 2 the original license of
+ * which is reproduced below.
+ *
+ * ========================================================================
+ *
+ * This C source file is part of the SoftFloat IEC/IEEE Floating-point
+ * Arithmetic Package, Release 2.
+ *
+ * Written by John R. Hauser.  This work was made possible in part by the
+ * International Computer Science Institute, located at Suite 600, 1947 Center
+ * Street, Berkeley, California 94704.  Funding was partially provided by the
+ * National Science Foundation under grant MIP-9311980.  The original version
+ * of this code was written as part of a project to build a fixed-point vector
+ * processor in collaboration with the University of California at Berkeley,
+ * overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
+ * is available through the web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
+ * arithmetic/softfloat.html'.
+ *
+ * THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
+ * has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
+ * TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
+ * PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
+ * AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
+ *
+ * Derivative works are acceptable, even for commercial purposes, so long as
+ * (1) they include prominent notice that the work is derivative, and (2) they
+ * include prominent notice akin to these three paragraphs for those parts of
+ * this code that are retained.
+ *
+ * ========================================================================
+ *
+ * SH4 modifications by Ismail Dhaoui <ismail.dhaoui@st.com>
+ * and Kamel Khelifi <kamel.khelifi@st.com>
+ */
+#include <linux/kernel.h>
+#include <asm/cpu/fpu.h>
+
+#define LIT64( a ) a##LL
+
+typedef char flag;
+typedef unsigned char uint8;
+typedef signed char int8;
+typedef int uint16;
+typedef int int16;
+typedef unsigned int uint32;
+typedef signed int int32;
+
+typedef unsigned long long int bits64;
+typedef signed long long int sbits64;
+
+typedef unsigned char bits8;
+typedef signed char sbits8;
+typedef unsigned short int bits16;
+typedef signed short int sbits16;
+typedef unsigned int bits32;
+typedef signed int sbits32;
+
+typedef unsigned long long int uint64;
+typedef signed long long int int64;
+
+typedef unsigned long int float32;
+typedef unsigned long long float64;
+
+extern void float_raise(unsigned int flags);    /* in fpu.c */
+extern int float_rounding_mode(void);   /* in fpu.c */
+
+inline bits64 extractFloat64Frac(float64 a);
+inline flag extractFloat64Sign(float64 a);
+inline int16 extractFloat64Exp(float64 a);
+inline int16 extractFloat32Exp(float32 a);
+inline flag extractFloat32Sign(float32 a);
+inline bits32 extractFloat32Frac(float32 a);
+inline float64 packFloat64(flag zSign, int16 zExp, bits64 zSig);
+inline void shift64RightJamming(bits64 a, int16 count, bits64 * zPtr);
+inline float32 packFloat32(flag zSign, int16 zExp, bits32 zSig);
+inline void shift32RightJamming(bits32 a, int16 count, bits32 * zPtr);
+float64 float64_sub(float64 a, float64 b);
+float32 float32_sub(float32 a, float32 b);
+float32 float32_add(float32 a, float32 b);
+float64 float64_add(float64 a, float64 b);
+float64 float64_div(float64 a, float64 b);
+float32 float32_div(float32 a, float32 b);
+float32 float32_mul(float32 a, float32 b);
+float64 float64_mul(float64 a, float64 b);
+inline void add128(bits64 a0, bits64 a1, bits64 b0, bits64 b1, bits64 * z0Ptr,
+                   bits64 * z1Ptr);
+inline void sub128(bits64 a0, bits64 a1, bits64 b0, bits64 b1, bits64 * z0Ptr,
+                   bits64 * z1Ptr);
+inline void mul64To128(bits64 a, bits64 b, bits64 * z0Ptr, bits64 * z1Ptr);
+
+static int8 countLeadingZeros32(bits32 a);
+static int8 countLeadingZeros64(bits64 a);
+static float64 normalizeRoundAndPackFloat64(flag zSign, int16 zExp,
+                                            bits64 zSig);
+static float64 subFloat64Sigs(float64 a, float64 b, flag zSign);
+static float64 addFloat64Sigs(float64 a, float64 b, flag zSign);
+static float32 roundAndPackFloat32(flag zSign, int16 zExp, bits32 zSig);
+static float32 normalizeRoundAndPackFloat32(flag zSign, int16 zExp,
+                                            bits32 zSig);
+static float64 roundAndPackFloat64(flag zSign, int16 zExp, bits64 zSig);
+static float32 subFloat32Sigs(float32 a, float32 b, flag zSign);
+static float32 addFloat32Sigs(float32 a, float32 b, flag zSign);
+static void normalizeFloat64Subnormal(bits64 aSig, int16 * zExpPtr,
+                                      bits64 * zSigPtr);
+static bits64 estimateDiv128To64(bits64 a0, bits64 a1, bits64 b);
+static void normalizeFloat32Subnormal(bits32 aSig, int16 * zExpPtr,
+                                      bits32 * zSigPtr);
+
+inline bits64 extractFloat64Frac(float64 a)
+{
+        return a & LIT64(0x000FFFFFFFFFFFFF);
+}
+
+inline flag extractFloat64Sign(float64 a)
+{
+        return a >> 63;
+}
+
+inline int16 extractFloat64Exp(float64 a)
+{
+        return (a >> 52) & 0x7FF;
+}
+
+inline int16 extractFloat32Exp(float32 a)
+{
+        return (a >> 23) & 0xFF;
+}
+
+inline flag extractFloat32Sign(float32 a)
+{
+        return a >> 31;
+}
+
+inline bits32 extractFloat32Frac(float32 a)
+{
+        return a & 0x007FFFFF;
+}
+
+inline float64 packFloat64(flag zSign, int16 zExp, bits64 zSig)
+{
+        return (((bits64) zSign) << 63) + (((bits64) zExp) << 52) + zSig;
+}
+
+inline void shift64RightJamming(bits64 a, int16 count, bits64 * zPtr)
+{
+        bits64 z;
+
+        if (count == 0) {
+                z = a;
+        } else if (count < 64) {
+                z = (a >> count) | ((a << ((-count) & 63)) != 0);
+        } else {
+                z = (a != 0);
+        }
+        *zPtr = z;
+}
+
+static int8 countLeadingZeros32(bits32 a)
+{
+        static const int8 countLeadingZerosHigh[] = {
+                8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
+                3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+                2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+                2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        };
+        int8 shiftCount;
+
+        shiftCount = 0;
+        if (a < 0x10000) {
+                shiftCount += 16;
+                a <<= 16;
+        }
+        if (a < 0x1000000) {
+                shiftCount += 8;
+                a <<= 8;
+        }
+        shiftCount += countLeadingZerosHigh[a >> 24];
+        return shiftCount;
+
+}
+
+static int8 countLeadingZeros64(bits64 a)
+{
+        int8 shiftCount;
+
+        shiftCount = 0;
+        if (a < ((bits64) 1) << 32) {
+                shiftCount += 32;
+        } else {
+                a >>= 32;
+        }
+        shiftCount += countLeadingZeros32(a);
+        return shiftCount;
+
+}
+
+static float64 normalizeRoundAndPackFloat64(flag zSign, int16 zExp, bits64 zSig)
+{
+        int8 shiftCount;
+
+        shiftCount = countLeadingZeros64(zSig) - 1;
+        return roundAndPackFloat64(zSign, zExp - shiftCount,
+                                   zSig << shiftCount);
+
+}
+
+static float64 subFloat64Sigs(float64 a, float64 b, flag zSign)
+{
+        int16 aExp, bExp, zExp;
+        bits64 aSig, bSig, zSig;
+        int16 expDiff;
+
+        aSig = extractFloat64Frac(a);
+        aExp = extractFloat64Exp(a);
+        bSig = extractFloat64Frac(b);
+        bExp = extractFloat64Exp(b);
+        expDiff = aExp - bExp;
+        aSig <<= 10;
+        bSig <<= 10;
+        if (0 < expDiff)
+                goto aExpBigger;
+        if (expDiff < 0)
+                goto bExpBigger;
+        if (aExp == 0) {
+                aExp = 1;
+                bExp = 1;
+        }
+        if (bSig < aSig)
+                goto aBigger;
+        if (aSig < bSig)
+                goto bBigger;
+        return packFloat64(float_rounding_mode() == FPSCR_RM_ZERO, 0, 0);
+      bExpBigger:
+        if (bExp == 0x7FF) {
+                return packFloat64(zSign ^ 1, 0x7FF, 0);
+        }
+        if (aExp == 0) {
+                ++expDiff;
+        } else {
+                aSig |= LIT64(0x4000000000000000);
+        }
+        shift64RightJamming(aSig, -expDiff, &aSig);
+        bSig |= LIT64(0x4000000000000000);
+      bBigger:
+        zSig = bSig - aSig;
+        zExp = bExp;
+        zSign ^= 1;
+        goto normalizeRoundAndPack;
+      aExpBigger:
+        if (aExp == 0x7FF) {
+                return a;
+        }
+        if (bExp == 0) {
+                --expDiff;
+        } else {
+                bSig |= LIT64(0x4000000000000000);
+        }
+        shift64RightJamming(bSig, expDiff, &bSig);
+        aSig |= LIT64(0x4000000000000000);
+      aBigger:
+        zSig = aSig - bSig;
+        zExp = aExp;
+      normalizeRoundAndPack:
+        --zExp;
+        return normalizeRoundAndPackFloat64(zSign, zExp, zSig);
+
+}
+static float64 addFloat64Sigs(float64 a, float64 b, flag zSign)
+{
+        int16 aExp, bExp, zExp;
+        bits64 aSig, bSig, zSig;
+        int16 expDiff;
+
+        aSig = extractFloat64Frac(a);
+        aExp = extractFloat64Exp(a);
+        bSig = extractFloat64Frac(b);
+        bExp = extractFloat64Exp(b);
+        expDiff = aExp - bExp;
+        aSig <<= 9;
+        bSig <<= 9;
+        if (0 < expDiff) {
+                if (aExp == 0x7FF) {
+                        return a;
+                }
+                if (bExp == 0) {
+                        --expDiff;
+                } else {
+                        bSig |= LIT64(0x2000000000000000);
+                }
+                shift64RightJamming(bSig, expDiff, &bSig);
+                zExp = aExp;
+        } else if (expDiff < 0) {
+                if (bExp == 0x7FF) {
+                        return packFloat64(zSign, 0x7FF, 0);
+                }
+                if (aExp == 0) {
+                        ++expDiff;
+                } else {
+                        aSig |= LIT64(0x2000000000000000);
+                }
+                shift64RightJamming(aSig, -expDiff, &aSig);
+                zExp = bExp;
+        } else {
+                if (aExp == 0x7FF) {
+                        return a;
+                }
+                if (aExp == 0)
+                        return packFloat64(zSign, 0, (aSig + bSig) >> 9);
+                zSig = LIT64(0x4000000000000000) + aSig + bSig;
+                zExp = aExp;
+                goto roundAndPack;
+        }
+        aSig |= LIT64(0x2000000000000000);
+        zSig = (aSig + bSig) << 1;
+        --zExp;
+        if ((sbits64) zSig < 0) {
+                zSig = aSig + bSig;
+                ++zExp;
+        }
+      roundAndPack:
+        return roundAndPackFloat64(zSign, zExp, zSig);
+
+}
+
+inline float32 packFloat32(flag zSign, int16 zExp, bits32 zSig)
+{
+        return (((bits32) zSign) << 31) + (((bits32) zExp) << 23) + zSig;
+}
+
+inline void shift32RightJamming(bits32 a, int16 count, bits32 * zPtr)
+{
+        bits32 z;
+        if (count == 0) {
+                z = a;
+        } else if (count < 32) {
+                z = (a >> count) | ((a << ((-count) & 31)) != 0);
+        } else {
+                z = (a != 0);
+        }
+        *zPtr = z;
+}
+
+static float32 roundAndPackFloat32(flag zSign, int16 zExp, bits32 zSig)
+{
+        flag roundNearestEven;
+        int8 roundIncrement, roundBits;
+        flag isTiny;
+
+        /* SH4 has only 2 rounding modes - round to nearest and round to zero */
+        roundNearestEven = (float_rounding_mode() == FPSCR_RM_NEAREST);
+        roundIncrement = 0x40;
+        if (!roundNearestEven) {
+                roundIncrement = 0;
+        }
+        roundBits = zSig & 0x7F;
+        if (0xFD <= (bits16) zExp) {
+                if ((0xFD < zExp)
+                    || ((zExp == 0xFD)
+                        && ((sbits32) (zSig + roundIncrement) < 0))
+                    ) {
+                        float_raise(FPSCR_CAUSE_OVERFLOW | FPSCR_CAUSE_INEXACT);
+                        return packFloat32(zSign, 0xFF,
+                                           0) - (roundIncrement == 0);
+                }
+                if (zExp < 0) {
+                        isTiny = (zExp < -1)
+                            || (zSig + roundIncrement < 0x80000000);
+                        shift32RightJamming(zSig, -zExp, &zSig);
+                        zExp = 0;
+                        roundBits = zSig & 0x7F;
+                        if (isTiny && roundBits)
+                                float_raise(FPSCR_CAUSE_UNDERFLOW);
+                }
+        }
+        if (roundBits)
+                float_raise(FPSCR_CAUSE_INEXACT);
+        zSig = (zSig + roundIncrement) >> 7;
+        zSig &= ~(((roundBits ^ 0x40) == 0) & roundNearestEven);
+        if (zSig == 0)
+                zExp = 0;
+        return packFloat32(zSign, zExp, zSig);
+
+}
+
+static float32 normalizeRoundAndPackFloat32(flag zSign, int16 zExp, bits32 zSig)
+{
+        int8 shiftCount;
+
+        shiftCount = countLeadingZeros32(zSig) - 1;
+        return roundAndPackFloat32(zSign, zExp - shiftCount,
+                                   zSig << shiftCount);
+}
+
+static float64 roundAndPackFloat64(flag zSign, int16 zExp, bits64 zSig)
+{
+        flag roundNearestEven;
+        int16 roundIncrement, roundBits;
+        flag isTiny;
+
+        /* SH4 has only 2 rounding modes - round to nearest and round to zero */
+        roundNearestEven = (float_rounding_mode() == FPSCR_RM_NEAREST);
+        roundIncrement = 0x200;
+        if (!roundNearestEven) {
+                roundIncrement = 0;
+        }
+        roundBits = zSig & 0x3FF;
+        if (0x7FD <= (bits16) zExp) {
+                if ((0x7FD < zExp)
+                    || ((zExp == 0x7FD)
+                        && ((sbits64) (zSig + roundIncrement) < 0))
+                    ) {
+                        float_raise(FPSCR_CAUSE_OVERFLOW | FPSCR_CAUSE_INEXACT);
+                        return packFloat64(zSign, 0x7FF,
+                                           0) - (roundIncrement == 0);
+                }
+                if (zExp < 0) {
+                        isTiny = (zExp < -1)
+                            || (zSig + roundIncrement <
+                                LIT64(0x8000000000000000));
+                        shift64RightJamming(zSig, -zExp, &zSig);
+                        zExp = 0;
+                        roundBits = zSig & 0x3FF;
+                        if (isTiny && roundBits)
+                                float_raise(FPSCR_CAUSE_UNDERFLOW);
+                }
+        }
+        if (roundBits)
+                float_raise(FPSCR_CAUSE_INEXACT);
+        zSig = (zSig + roundIncrement) >> 10;
+        zSig &= ~(((roundBits ^ 0x200) == 0) & roundNearestEven);
+        if (zSig == 0)
+                zExp = 0;
+        return packFloat64(zSign, zExp, zSig);
+
+}
+
+static float32 subFloat32Sigs(float32 a, float32 b, flag zSign)
+{
+        int16 aExp, bExp, zExp;
+        bits32 aSig, bSig, zSig;
+        int16 expDiff;
+
+        aSig = extractFloat32Frac(a);
+        aExp = extractFloat32Exp(a);
+        bSig = extractFloat32Frac(b);
+        bExp = extractFloat32Exp(b);
+        expDiff = aExp - bExp;
+        aSig <<= 7;
+        bSig <<= 7;
+        if (0 < expDiff)
+                goto aExpBigger;
+        if (expDiff < 0)
+                goto bExpBigger;
+        if (aExp == 0) {
+                aExp = 1;
+                bExp = 1;
+        }
+        if (bSig < aSig)
+                goto aBigger;
+        if (aSig < bSig)
+                goto bBigger;
+        return packFloat32(float_rounding_mode() == FPSCR_RM_ZERO, 0, 0);
+      bExpBigger:
+        if (bExp == 0xFF) {
+                return packFloat32(zSign ^ 1, 0xFF, 0);
+        }
+        if (aExp == 0) {
+                ++expDiff;
+        } else {
+                aSig |= 0x40000000;
+        }
+        shift32RightJamming(aSig, -expDiff, &aSig);
+        bSig |= 0x40000000;
+      bBigger:
+        zSig = bSig - aSig;
+        zExp = bExp;
+        zSign ^= 1;
+        goto normalizeRoundAndPack;
+      aExpBigger:
+        if (aExp == 0xFF) {
+                return a;
+        }
+        if (bExp == 0) {
+                --expDiff;
+        } else {
+                bSig |= 0x40000000;
+        }
+        shift32RightJamming(bSig, expDiff, &bSig);
+        aSig |= 0x40000000;
+      aBigger:
+        zSig = aSig - bSig;
+        zExp = aExp;
+      normalizeRoundAndPack:
+        --zExp;
+        return normalizeRoundAndPackFloat32(zSign, zExp, zSig);
+
+}
+
+static float32 addFloat32Sigs(float32 a, float32 b, flag zSign)
+{
+        int16 aExp, bExp, zExp;
+        bits32 aSig, bSig, zSig;
+        int16 expDiff;
+
+        aSig = extractFloat32Frac(a);
+        aExp = extractFloat32Exp(a);
+        bSig = extractFloat32Frac(b);
+        bExp = extractFloat32Exp(b);
+        expDiff = aExp - bExp;
+        aSig <<= 6;
+        bSig <<= 6;
+        if (0 < expDiff) {
+                if (aExp == 0xFF) {
+                        return a;
+                }
+                if (bExp == 0) {
+                        --expDiff;
+                } else {
+                        bSig |= 0x20000000;
+                }
+                shift32RightJamming(bSig, expDiff, &bSig);
+                zExp = aExp;
+        } else if (expDiff < 0) {
+                if (bExp == 0xFF) {
+                        return packFloat32(zSign, 0xFF, 0);
+                }
+                if (aExp == 0) {
+                        ++expDiff;
+                } else {
+                        aSig |= 0x20000000;
+                }
+                shift32RightJamming(aSig, -expDiff, &aSig);
+                zExp = bExp;
+        } else {
+                if (aExp == 0xFF) {
+                        return a;
+                }
+                if (aExp == 0)
+                        return packFloat32(zSign, 0, (aSig + bSig) >> 6);
+                zSig = 0x40000000 + aSig + bSig;
+                zExp = aExp;
+                goto roundAndPack;
+        }
+        aSig |= 0x20000000;
+        zSig = (aSig + bSig) << 1;
+        --zExp;
+        if ((sbits32) zSig < 0) {
+                zSig = aSig + bSig;
+                ++zExp;
+        }
+      roundAndPack:
+        return roundAndPackFloat32(zSign, zExp, zSig);
+
+}
+
+float64 float64_sub(float64 a, float64 b)
+{
+        flag aSign, bSign;
+
+        aSign = extractFloat64Sign(a);
+        bSign = extractFloat64Sign(b);
+        if (aSign == bSign) {
+                return subFloat64Sigs(a, b, aSign);
+        } else {
+                return addFloat64Sigs(a, b, aSign);
+        }
+
+}
+
+float32 float32_sub(float32 a, float32 b)
+{
+        flag aSign, bSign;
+
+        aSign = extractFloat32Sign(a);
+        bSign = extractFloat32Sign(b);
+        if (aSign == bSign) {
+                return subFloat32Sigs(a, b, aSign);
+        } else {
+                return addFloat32Sigs(a, b, aSign);
+        }
+
+}
+
+float32 float32_add(float32 a, float32 b)
+{
+        flag aSign, bSign;
+
+        aSign = extractFloat32Sign(a);
+        bSign = extractFloat32Sign(b);
+        if (aSign == bSign) {
+                return addFloat32Sigs(a, b, aSign);
+        } else {
+                return subFloat32Sigs(a, b, aSign);
+        }
+
+}
+
+float64 float64_add(float64 a, float64 b)
+{
+        flag aSign, bSign;
+
+        aSign = extractFloat64Sign(a);
+        bSign = extractFloat64Sign(b);
+        if (aSign == bSign) {
+                return addFloat64Sigs(a, b, aSign);
+        } else {
+                return subFloat64Sigs(a, b, aSign);
+        }
+}
+
+static void
+normalizeFloat64Subnormal(bits64 aSig, int16 * zExpPtr, bits64 * zSigPtr)
+{
+        int8 shiftCount;
+
+        shiftCount = countLeadingZeros64(aSig) - 11;
+        *zSigPtr = aSig << shiftCount;
+        *zExpPtr = 1 - shiftCount;
+}
+
+inline void add128(bits64 a0, bits64 a1, bits64 b0, bits64 b1, bits64 * z0Ptr,
+                   bits64 * z1Ptr)
+{
+        bits64 z1;
+
+        z1 = a1 + b1;
+        *z1Ptr = z1;
+        *z0Ptr = a0 + b0 + (z1 < a1);
+}
+
+inline void
+sub128(bits64 a0, bits64 a1, bits64 b0, bits64 b1, bits64 * z0Ptr,
+       bits64 * z1Ptr)
+{
+        *z1Ptr = a1 - b1;
+        *z0Ptr = a0 - b0 - (a1 < b1);
+}
+
+static bits64 estimateDiv128To64(bits64 a0, bits64 a1, bits64 b)
+{
+        bits64 b0, b1;
+        bits64 rem0, rem1, term0, term1;
+        bits64 z;
+        if (b <= a0)
+                return LIT64(0xFFFFFFFFFFFFFFFF);
+        b0 = b >> 32;
+        z = (b0 << 32 <= a0) ? LIT64(0xFFFFFFFF00000000) : (a0 / b0) << 32;
+        mul64To128(b, z, &term0, &term1);
+        sub128(a0, a1, term0, term1, &rem0, &rem1);
+        while (((sbits64) rem0) < 0) {
+                z -= LIT64(0x100000000);
+                b1 = b << 32;
+                add128(rem0, rem1, b0, b1, &rem0, &rem1);
+        }
+        rem0 = (rem0 << 32) | (rem1 >> 32);
+        z |= (b0 << 32 <= rem0) ? 0xFFFFFFFF : rem0 / b0;
+        return z;
+}
+
+inline void mul64To128(bits64 a, bits64 b, bits64 * z0Ptr, bits64 * z1Ptr)
+{
+        bits32 aHigh, aLow, bHigh, bLow;
+        bits64 z0, zMiddleA, zMiddleB, z1;
+
+        aLow = a;
+        aHigh = a >> 32;
+        bLow = b;
+        bHigh = b >> 32;
+        z1 = ((bits64) aLow) * bLow;
+        zMiddleA = ((bits64) aLow) * bHigh;
+        zMiddleB = ((bits64) aHigh) * bLow;
+        z0 = ((bits64) aHigh) * bHigh;
+        zMiddleA += zMiddleB;
+        z0 += (((bits64) (zMiddleA < zMiddleB)) << 32) + (zMiddleA >> 32);
+        zMiddleA <<= 32;
+        z1 += zMiddleA;
+        z0 += (z1 < zMiddleA);
+        *z1Ptr = z1;
+        *z0Ptr = z0;
+
+}
+
+static void normalizeFloat32Subnormal(bits32 aSig, int16 * zExpPtr,
+                                      bits32 * zSigPtr)
+{
+        int8 shiftCount;
+
+        shiftCount = countLeadingZeros32(aSig) - 8;
+        *zSigPtr = aSig << shiftCount;
+        *zExpPtr = 1 - shiftCount;
+
+}
+
+float64 float64_div(float64 a, float64 b)
+{
+        flag aSign, bSign, zSign;
+        int16 aExp, bExp, zExp;
+        bits64 aSig, bSig, zSig;
+        bits64 rem0, rem1;
+        bits64 term0, term1;
+
+        aSig = extractFloat64Frac(a);
+        aExp = extractFloat64Exp(a);
+        aSign = extractFloat64Sign(a);
+        bSig = extractFloat64Frac(b);
+        bExp = extractFloat64Exp(b);
+        bSign = extractFloat64Sign(b);
+        zSign = aSign ^ bSign;
+        if (aExp == 0x7FF) {
+                if (bExp == 0x7FF) {
+                }
+                return packFloat64(zSign, 0x7FF, 0);
+        }
+        if (bExp == 0x7FF) {
+                return packFloat64(zSign, 0, 0);
+        }
+        if (bExp == 0) {
+                if (bSig == 0) {
+                        if ((aExp | aSig) == 0) {
+                                float_raise(FPSCR_CAUSE_INVALID);
+                        }
+                        return packFloat64(zSign, 0x7FF, 0);
+                }
+                normalizeFloat64Subnormal(bSig, &bExp, &bSig);
+        }
+        if (aExp == 0) {
+                if (aSig == 0)
+                        return packFloat64(zSign, 0, 0);
+                normalizeFloat64Subnormal(aSig, &aExp, &aSig);
+        }
+        zExp = aExp - bExp + 0x3FD;
+        aSig = (aSig | LIT64(0x0010000000000000)) << 10;
+        bSig = (bSig | LIT64(0x0010000000000000)) << 11;
+        if (bSig <= (aSig + aSig)) {
+                aSig >>= 1;
+                ++zExp;
+        }
+        zSig = estimateDiv128To64(aSig, 0, bSig);
+        if ((zSig & 0x1FF) <= 2) {
+                mul64To128(bSig, zSig, &term0, &term1);
+                sub128(aSig, 0, term0, term1, &rem0, &rem1);
+                while ((sbits64) rem0 < 0) {
+                        --zSig;
+                        add128(rem0, rem1, 0, bSig, &rem0, &rem1);
+                }
+                zSig |= (rem1 != 0);
+        }
+        return roundAndPackFloat64(zSign, zExp, zSig);
+
+}
+
+float32 float32_div(float32 a, float32 b)
+{
+        flag aSign, bSign, zSign;
+        int16 aExp, bExp, zExp;
+        bits32 aSig, bSig, zSig;
+
+        aSig = extractFloat32Frac(a);
+        aExp = extractFloat32Exp(a);
+        aSign = extractFloat32Sign(a);
+        bSig = extractFloat32Frac(b);
+        bExp = extractFloat32Exp(b);
+        bSign = extractFloat32Sign(b);
+        zSign = aSign ^ bSign;
+        if (aExp == 0xFF) {
+                if (bExp == 0xFF) {
+                }
+                return packFloat32(zSign, 0xFF, 0);
+        }
+        if (bExp == 0xFF) {
+                return packFloat32(zSign, 0, 0);
+        }
+        if (bExp == 0) {
+                if (bSig == 0) {
+                        return packFloat32(zSign, 0xFF, 0);
+                }
+                normalizeFloat32Subnormal(bSig, &bExp, &bSig);
+        }
+        if (aExp == 0) {
+                if (aSig == 0)
+                        return packFloat32(zSign, 0, 0);
+                normalizeFloat32Subnormal(aSig, &aExp, &aSig);
+        }
+        zExp = aExp - bExp + 0x7D;
+        aSig = (aSig | 0x00800000) << 7;
+        bSig = (bSig | 0x00800000) << 8;
+        if (bSig <= (aSig + aSig)) {
+                aSig >>= 1;
+                ++zExp;
+        }
+        zSig = (((bits64) aSig) << 32) / bSig;
+        if ((zSig & 0x3F) == 0) {
+                zSig |= (((bits64) bSig) * zSig != ((bits64) aSig) << 32);
+        }
+        return roundAndPackFloat32(zSign, zExp, zSig);
+
+}
+
+float32 float32_mul(float32 a, float32 b)
+{
+        char aSign, bSign, zSign;
+        int aExp, bExp, zExp;
+        unsigned int aSig, bSig;
+        unsigned long long zSig64;
+        unsigned int zSig;
+
+        aSig = extractFloat32Frac(a);
+        aExp = extractFloat32Exp(a);
+        aSign = extractFloat32Sign(a);
+        bSig = extractFloat32Frac(b);
+        bExp = extractFloat32Exp(b);
+        bSign = extractFloat32Sign(b);
+        zSign = aSign ^ bSign;
+        if (aExp == 0) {
+                if (aSig == 0)
+                        return packFloat32(zSign, 0, 0);
+                normalizeFloat32Subnormal(aSig, &aExp, &aSig);
+        }
+        if (bExp == 0) {
+                if (bSig == 0)
+                        return packFloat32(zSign, 0, 0);
+                normalizeFloat32Subnormal(bSig, &bExp, &bSig);
+        }
+        if ((bExp == 0xff && bSig == 0) || (aExp == 0xff && aSig == 0))
+                return roundAndPackFloat32(zSign, 0xff, 0);
+
+        zExp = aExp + bExp - 0x7F;
+        aSig = (aSig | 0x00800000) << 7;
+        bSig = (bSig | 0x00800000) << 8;
+        shift64RightJamming(((unsigned long long)aSig) * bSig, 32, &zSig64);
+        zSig = zSig64;
+        if (0 <= (signed int)(zSig << 1)) {
+                zSig <<= 1;
+                --zExp;
+        }
+        return roundAndPackFloat32(zSign, zExp, zSig);
+
+}
+
+float64 float64_mul(float64 a, float64 b)
+{
+        char aSign, bSign, zSign;
+        int aExp, bExp, zExp;
+        unsigned long long int aSig, bSig, zSig0, zSig1;
+
+        aSig = extractFloat64Frac(a);
+        aExp = extractFloat64Exp(a);
+        aSign = extractFloat64Sign(a);
+        bSig = extractFloat64Frac(b);
+        bExp = extractFloat64Exp(b);
+        bSign = extractFloat64Sign(b);
+        zSign = aSign ^ bSign;
+
+        if (aExp == 0) {
+                if (aSig == 0)
+                        return packFloat64(zSign, 0, 0);
+                normalizeFloat64Subnormal(aSig, &aExp, &aSig);
+        }
+        if (bExp == 0) {
+                if (bSig == 0)
+                        return packFloat64(zSign, 0, 0);
+                normalizeFloat64Subnormal(bSig, &bExp, &bSig);
+        }
+        if ((aExp == 0x7ff && aSig == 0) || (bExp == 0x7ff && bSig == 0))
+                return roundAndPackFloat64(zSign, 0x7ff, 0);
+
+        zExp = aExp + bExp - 0x3FF;
+        aSig = (aSig | 0x0010000000000000LL) << 10;
+        bSig = (bSig | 0x0010000000000000LL) << 11;
+        mul64To128(aSig, bSig, &zSig0, &zSig1);
+        zSig0 |= (zSig1 != 0);
+        if (0 <= (signed long long int)(zSig0 << 1)) {
+                zSig0 <<= 1;
+                --zExp;
+        }
+        return roundAndPackFloat64(zSign, zExp, zSig0);
+}
diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile
index 24539873943a..08ac6387bf17 100644
--- a/arch/sh/kernel/cpu/sh4a/Makefile
+++ b/arch/sh/kernel/cpu/sh4a/Makefile
@@ -3,6 +3,7 @@
 #
 
 # CPU subtype setup
+obj-$(CONFIG_CPU_SUBTYPE_SH7763)        += setup-sh7763.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7770)        += setup-sh7770.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7780)        += setup-sh7780.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7785)        += setup-sh7785.o
@@ -14,6 +15,7 @@ obj-$(CONFIG_CPU_SUBTYPE_SHX3)		+= setup-shx3.o
 smp-$(CONFIG_CPU_SUBTYPE_SHX3)          := smp-shx3.o
 
 # Primary on-chip clocks (common)
+clock-$(CONFIG_CPU_SUBTYPE_SH7763)      := clock-sh7763.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7770)      := clock-sh7770.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7780)      := clock-sh7780.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7785)      := clock-sh7785.o
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7763.c b/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
new file mode 100644
index 000000000000..45889d412c80
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
@@ -0,0 +1,126 @@
+/*
+ * arch/sh/kernel/cpu/sh4a/clock-sh7763.c
+ *
+ * SH7763 support for the clock framework
+ *
+ *  Copyright (C) 2005  Paul Mundt
+ *  Copyright (C) 2007  Yoshihiro Shimoda
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <asm/clock.h>
+#include <asm/freq.h>
+#include <asm/io.h>
+
+static int bfc_divisors[] = { 1, 1, 1, 8, 1, 1, 1, 1 };
+static int p0fc_divisors[] = { 1, 1, 1, 8, 1, 1, 1, 1 };
+static int p1fc_divisors[] = { 1, 1, 1, 16, 1, 1, 1, 1 };
+static int cfc_divisors[] = { 1, 1, 4, 1, 1, 1, 1, 1 };
+
+static void master_clk_init(struct clk *clk)
+{
+        clk->rate *= p0fc_divisors[(ctrl_inl(FRQCR) >> 4) & 0x07];
+}
+
+static struct clk_ops sh7763_master_clk_ops = {
+        .init           = master_clk_init,
+};
+
+static void module_clk_recalc(struct clk *clk)
+{
+        int idx = ((ctrl_inl(FRQCR) >> 4) & 0x07);
+        clk->rate = clk->parent->rate / p0fc_divisors[idx];
+}
+
+static struct clk_ops sh7763_module_clk_ops = {
+        .recalc         = module_clk_recalc,
+};
+
+static void bus_clk_recalc(struct clk *clk)
+{
+        int idx = ((ctrl_inl(FRQCR) >> 16) & 0x07);
+        clk->rate = clk->parent->rate / bfc_divisors[idx];
+}
+
+static struct clk_ops sh7763_bus_clk_ops = {
+        .recalc         = bus_clk_recalc,
+};
+
+static void cpu_clk_recalc(struct clk *clk)
+{
+        clk->rate = clk->parent->rate;
+}
+
+static struct clk_ops sh7763_cpu_clk_ops = {
+        .recalc         = cpu_clk_recalc,
+};
+
+static struct clk_ops *sh7763_clk_ops[] = {
+        &sh7763_master_clk_ops,
+        &sh7763_module_clk_ops,
+        &sh7763_bus_clk_ops,
+        &sh7763_cpu_clk_ops,
+};
+
+void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
+{
+        if (idx < ARRAY_SIZE(sh7763_clk_ops))
+                *ops = sh7763_clk_ops[idx];
+}
+
+static void shyway_clk_recalc(struct clk *clk)
+{
+        int idx = ((ctrl_inl(FRQCR) >> 20) & 0x07);
+        clk->rate = clk->parent->rate / cfc_divisors[idx];
+}
+
+static struct clk_ops sh7763_shyway_clk_ops = {
+        .recalc         = shyway_clk_recalc,
+};
+
+static struct clk sh7763_shyway_clk = {
+        .name           = "shyway_clk",
+        .flags          = CLK_ALWAYS_ENABLED,
+        .ops            = &sh7763_shyway_clk_ops,
+};
+
+/*
+ * Additional SH7763-specific on-chip clocks that aren't already part of the
+ * clock framework
+ */
+static struct clk *sh7763_onchip_clocks[] = {
+        &sh7763_shyway_clk,
+};
+
+static int __init sh7763_clk_init(void)
+{
+        struct clk *clk = clk_get(NULL, "master_clk");
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(sh7763_onchip_clocks); i++) {
+                struct clk *clkp = sh7763_onchip_clocks[i];
+
+                clkp->parent = clk;
+                clk_register(clkp);
+                clk_enable(clkp);
+        }
+
+        /*
+         * Now that we have the rest of the clocks registered, we need to
+         * force the parent clock to propagate so that these clocks will
+         * automatically figure out their rate. We cheat by handing the
+         * parent clock its current rate and forcing child propagation.
+         */
+        clk_set_rate(clk, clk_get_rate(clk));
+
+        clk_put(clk);
+
+        return 0;
+}
+
+arch_initcall(sh7763_clk_init);
+
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index b9c6547c4a90..73c778d40d13 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -157,14 +157,6 @@ static struct intc_group groups[] __initdata = {
         INTC_GROUP(SDHI, SDHI0, SDHI1, SDHI2, SDHI3),
 };
 
-static struct intc_prio priorities[] __initdata = {
-        INTC_PRIO(SCIF0, 3),
-        INTC_PRIO(SCIF1, 3),
-        INTC_PRIO(SCIF2, 3),
-        INTC_PRIO(TMU0, 2),
-        INTC_PRIO(TMU1, 2),
-};
-
 static struct intc_mask_reg mask_registers[] __initdata = {
         { 0xa4080080, 0xa40800c0, 8, /* IMR0 / IMCR0 */
           { } },
@@ -217,7 +209,7 @@ static struct intc_sense_reg sense_registers[] __initdata = {
           { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
 };
 
-static DECLARE_INTC_DESC(intc_desc, "sh7722", vectors, groups, priorities,
+static DECLARE_INTC_DESC(intc_desc, "sh7722", vectors, groups,
                          mask_registers, prio_registers, sense_registers);
 
 void __init plat_irq_setup(void)
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
new file mode 100644
index 000000000000..eabd5386812d
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
@@ -0,0 +1,390 @@
+/*
+ * SH7763 Setup
+ *
+ *  Copyright (C) 2006  Paul Mundt
+ *  Copyright (C) 2007  Yoshihiro Shimoda
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <linux/io.h>
+#include <asm/sci.h>
+
+static struct resource rtc_resources[] = {
+        [0] = {
+                .start  = 0xffe80000,
+                .end    = 0xffe80000 + 0x58 - 1,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                /* Period IRQ */
+                .start  = 21,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                /* Carry IRQ */
+                .start  = 22,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                /* Alarm IRQ */
+                .start  = 20,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device rtc_device = {
+        .name           = "sh-rtc",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(rtc_resources),
+        .resource       = rtc_resources,
+};
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xffe00000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 40, 41, 43, 42 },
+        }, {
+                .mapbase        = 0xffe08000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 76, 77, 79, 78 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct resource usb_ohci_resources[] = {
+        [0] = {
+                .start  = 0xffec8000,
+                .end    = 0xffec80ff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 83,
+                .end    = 83,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static u64 usb_ohci_dma_mask = 0xffffffffUL;
+static struct platform_device usb_ohci_device = {
+        .name           = "sh_ohci",
+        .id             = -1,
+        .dev = {
+                .dma_mask               = &usb_ohci_dma_mask,
+                .coherent_dma_mask      = 0xffffffff,
+        },
+        .num_resources  = ARRAY_SIZE(usb_ohci_resources),
+        .resource       = usb_ohci_resources,
+};
+
+static struct resource usbf_resources[] = {
+        [0] = {
+                .start  = 0xffec0000,
+                .end    = 0xffec00ff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 84,
+                .end    = 84,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device usbf_device = {
+        .name           = "sh_udc",
+        .id             = -1,
+        .dev = {
+                .dma_mask               = NULL,
+                .coherent_dma_mask      = 0xffffffff,
+        },
+        .num_resources  = ARRAY_SIZE(usbf_resources),
+        .resource       = usbf_resources,
+};
+
+static struct platform_device *sh7763_devices[] __initdata = {
+        &rtc_device,
+        &sci_device,
+        &usb_ohci_device,
+        &usbf_device,
+};
+
+static int __init sh7763_devices_setup(void)
+{
+        return platform_add_devices(sh7763_devices,
+                                    ARRAY_SIZE(sh7763_devices));
+}
+__initcall(sh7763_devices_setup);
+
+enum {
+        UNUSED = 0,
+
+        /* interrupt sources */
+
+        IRL_LLLL, IRL_LLLH, IRL_LLHL, IRL_LLHH,
+        IRL_LHLL, IRL_LHLH, IRL_LHHL, IRL_LHHH,
+        IRL_HLLL, IRL_HLLH, IRL_HLHL, IRL_HLHH,
+        IRL_HHLL, IRL_HHLH, IRL_HHHL,
+
+        IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7,
+        RTC_ATI, RTC_PRI, RTC_CUI,
+        WDT, TMU0, TMU1, TMU2, TMU2_TICPI,
+        HUDI, LCDC,
+        DMAC0_DMINT0, DMAC0_DMINT1, DMAC0_DMINT2, DMAC0_DMINT3, DMAC0_DMAE,
+        SCIF0_ERI, SCIF0_RXI, SCIF0_BRI, SCIF0_TXI,
+        DMAC0_DMINT4, DMAC0_DMINT5,
+        IIC0, IIC1,
+        CMT,
+        GEINT0, GEINT1, GEINT2,
+        HAC,
+        PCISERR, PCIINTA, PCIINTB, PCIINTC, PCIINTD,
+        PCIERR, PCIPWD3, PCIPWD2, PCIPWD1, PCIPWD0,
+        STIF0, STIF1,
+        SCIF1_ERI, SCIF1_RXI, SCIF1_BRI, SCIF1_TXI,
+        SIOF0, SIOF1, SIOF2,
+        USBH, USBFI0, USBFI1,
+        TPU, PCC,
+        MMCIF_FSTAT, MMCIF_TRAN, MMCIF_ERR, MMCIF_FRDY,
+        SIM_ERI, SIM_RXI, SIM_TXI, SIM_TEND,
+        TMU3, TMU4, TMU5, ADC, SSI0, SSI1, SSI2, SSI3,
+        SCIF2_ERI, SCIF2_RXI, SCIF2_BRI, SCIF2_TXI,
+        GPIO_CH0, GPIO_CH1, GPIO_CH2, GPIO_CH3,
+
+        /* interrupt groups */
+
+        TMU012, TMU345, RTC, DMAC, SCIF0, GETHER, PCIC5,
+        SCIF1, USBF, MMCIF, SIM, SCIF2, GPIO,
+};
+
+static struct intc_vect vectors[] __initdata = {
+        INTC_VECT(RTC_ATI, 0x480), INTC_VECT(RTC_PRI, 0x4a0),
+        INTC_VECT(RTC_CUI, 0x4c0),
+        INTC_VECT(WDT, 0x560), INTC_VECT(TMU0, 0x580),
+        INTC_VECT(TMU1, 0x5a0), INTC_VECT(TMU2, 0x5c0),
+        INTC_VECT(TMU2_TICPI, 0x5e0), INTC_VECT(HUDI, 0x600),
+        INTC_VECT(LCDC, 0x620),
+        INTC_VECT(DMAC0_DMINT0, 0x640), INTC_VECT(DMAC0_DMINT1, 0x660),
+        INTC_VECT(DMAC0_DMINT2, 0x680), INTC_VECT(DMAC0_DMINT3, 0x6a0),
+        INTC_VECT(DMAC0_DMAE, 0x6c0),
+        INTC_VECT(SCIF0_ERI, 0x700), INTC_VECT(SCIF0_RXI, 0x720),
+        INTC_VECT(SCIF0_BRI, 0x740), INTC_VECT(SCIF0_TXI, 0x760),
+        INTC_VECT(DMAC0_DMINT4, 0x780), INTC_VECT(DMAC0_DMINT5, 0x7a0),
+        INTC_VECT(IIC0, 0x8A0), INTC_VECT(IIC1, 0x8C0),
+        INTC_VECT(CMT, 0x900), INTC_VECT(GEINT0, 0x920),
+        INTC_VECT(GEINT1, 0x940), INTC_VECT(GEINT2, 0x960),
+        INTC_VECT(HAC, 0x980),
+        INTC_VECT(PCISERR, 0xa00), INTC_VECT(PCIINTA, 0xa20),
+        INTC_VECT(PCIINTB, 0xa40), INTC_VECT(PCIINTC, 0xa60),
+        INTC_VECT(PCIINTD, 0xa80), INTC_VECT(PCIERR, 0xaa0),
+        INTC_VECT(PCIPWD3, 0xac0), INTC_VECT(PCIPWD2, 0xae0),
+        INTC_VECT(PCIPWD1, 0xb00), INTC_VECT(PCIPWD0, 0xb20),
+        INTC_VECT(STIF0, 0xb40), INTC_VECT(STIF1, 0xb60),
+        INTC_VECT(SCIF1_ERI, 0xb80), INTC_VECT(SCIF1_RXI, 0xba0),
+        INTC_VECT(SCIF1_BRI, 0xbc0), INTC_VECT(SCIF1_TXI, 0xbe0),
+        INTC_VECT(SIOF0, 0xc00), INTC_VECT(SIOF1, 0xc20),
+        INTC_VECT(USBH, 0xc60), INTC_VECT(USBFI0, 0xc80),
+        INTC_VECT(USBFI1, 0xca0),
+        INTC_VECT(TPU, 0xcc0), INTC_VECT(PCC, 0xce0),
+        INTC_VECT(MMCIF_FSTAT, 0xd00), INTC_VECT(MMCIF_TRAN, 0xd20),
+        INTC_VECT(MMCIF_ERR, 0xd40), INTC_VECT(MMCIF_FRDY, 0xd60),
+        INTC_VECT(SIM_ERI, 0xd80), INTC_VECT(SIM_RXI, 0xda0),
+        INTC_VECT(SIM_TXI, 0xdc0), INTC_VECT(SIM_TEND, 0xde0),
+        INTC_VECT(TMU3, 0xe00), INTC_VECT(TMU4, 0xe20),
+        INTC_VECT(TMU5, 0xe40), INTC_VECT(ADC, 0xe60),
+        INTC_VECT(SSI0, 0xe80), INTC_VECT(SSI1, 0xea0),
+        INTC_VECT(SSI2, 0xec0), INTC_VECT(SSI3, 0xee0),
+        INTC_VECT(SCIF1_ERI, 0xf00), INTC_VECT(SCIF1_RXI, 0xf20),
+        INTC_VECT(SCIF1_BRI, 0xf40), INTC_VECT(SCIF1_TXI, 0xf60),
+        INTC_VECT(GPIO_CH0, 0xf80), INTC_VECT(GPIO_CH1, 0xfa0),
+        INTC_VECT(GPIO_CH2, 0xfc0), INTC_VECT(GPIO_CH3, 0xfe0),
+};
+
+static struct intc_group groups[] __initdata = {
+        INTC_GROUP(TMU012, TMU0, TMU1, TMU2, TMU2_TICPI),
+        INTC_GROUP(TMU345, TMU3, TMU4, TMU5),
+        INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI),
+        INTC_GROUP(DMAC, DMAC0_DMINT0, DMAC0_DMINT1, DMAC0_DMINT2,
+                   DMAC0_DMINT3, DMAC0_DMINT4, DMAC0_DMINT5, DMAC0_DMAE),
+        INTC_GROUP(SCIF0, SCIF0_ERI, SCIF0_RXI, SCIF0_BRI, SCIF0_TXI),
+        INTC_GROUP(GETHER, GEINT0, GEINT1, GEINT2),
+        INTC_GROUP(PCIC5, PCIERR, PCIPWD3, PCIPWD2, PCIPWD1, PCIPWD0),
+        INTC_GROUP(SCIF1, SCIF1_ERI, SCIF1_RXI, SCIF1_BRI, SCIF1_TXI),
+        INTC_GROUP(USBF, USBFI0, USBFI1),
+        INTC_GROUP(MMCIF, MMCIF_FSTAT, MMCIF_TRAN, MMCIF_ERR, MMCIF_FRDY),
+        INTC_GROUP(SIM, SIM_ERI, SIM_RXI, SIM_TXI, SIM_TEND),
+        INTC_GROUP(SCIF2, SCIF2_ERI, SCIF2_RXI, SCIF2_BRI, SCIF2_TXI),
+        INTC_GROUP(GPIO, GPIO_CH0, GPIO_CH1, GPIO_CH2, GPIO_CH3),
+};
+
+static struct intc_prio priorities[] __initdata = {
+        INTC_PRIO(SCIF0, 3),
+        INTC_PRIO(SCIF1, 3),
+        INTC_PRIO(SCIF2, 3),
+};
+
+static struct intc_mask_reg mask_registers[] __initdata = {
+        { 0xffd40038, 0xffd4003c, 32, /* INT2MSKR / INT2MSKCR */
+          { 0, 0, 0, 0, 0, 0, GPIO, 0,
+            SSI0, MMCIF, 0, SIOF0, PCIC5, PCIINTD, PCIINTC, PCIINTB,
+            PCIINTA, PCISERR, HAC, CMT, 0, 0, 0, DMAC,
+            HUDI, 0, WDT, SCIF1, SCIF0, RTC, TMU345, TMU012 } },
+        { 0xffd400d0, 0xffd400d4, 32, /* INT2MSKR1 / INT2MSKCR1 */
+          { 0, 0, 0, 0, 0, 0, SCIF2, USBF,
+            0, 0, STIF1, STIF0, 0, 0, USBH, GETHER,
+            PCC, 0, 0, ADC, TPU, SIM, SIOF2, SIOF1,
+            LCDC, 0, IIC1, IIC0, SSI3, SSI2, SSI1, 0 } },
+};
+
+static struct intc_prio_reg prio_registers[] __initdata = {
+        { 0xffd40000, 0, 32, 8, /* INT2PRI0 */ { TMU0, TMU1,
+                                                 TMU2, TMU2_TICPI } },
+        { 0xffd40004, 0, 32, 8, /* INT2PRI1 */ { TMU3, TMU4, TMU5, RTC } },
+        { 0xffd40008, 0, 32, 8, /* INT2PRI2 */ { SCIF0, SCIF1, WDT } },
+        { 0xffd4000c, 0, 32, 8, /* INT2PRI3 */ { HUDI, DMAC, ADC } },
+        { 0xffd40010, 0, 32, 8, /* INT2PRI4 */ { CMT, HAC,
+                                                 PCISERR, PCIINTA } },
+        { 0xffd40014, 0, 32, 8, /* INT2PRI5 */ { PCIINTB, PCIINTC,
+                                                 PCIINTD, PCIC5 } },
+        { 0xffd40018, 0, 32, 8, /* INT2PRI6 */ { SIOF0, USBF, MMCIF, SSI0 } },
+        { 0xffd4001c, 0, 32, 8, /* INT2PRI7 */ { SCIF2, GPIO } },
+        { 0xffd400a0, 0, 32, 8, /* INT2PRI8 */ { SSI3, SSI2, SSI1, 0 } },
+        { 0xffd400a4, 0, 32, 8, /* INT2PRI9 */ { LCDC, 0, IIC1, IIC0 } },
+        { 0xffd400a8, 0, 32, 8, /* INT2PRI10 */ { TPU, SIM, SIOF2, SIOF1 } },
+        { 0xffd400ac, 0, 32, 8, /* INT2PRI11 */ { PCC } },
+        { 0xffd400b0, 0, 32, 8, /* INT2PRI12 */ { 0, 0, USBH, GETHER } },
+        { 0xffd400b4, 0, 32, 8, /* INT2PRI13 */ { 0, 0, STIF1, STIF0 } },
+};
+
+static DECLARE_INTC_DESC(intc_desc, "sh7763", vectors, groups, priorities,
+                         mask_registers, prio_registers, NULL);
+
+/* Support for external interrupt pins in IRQ mode */
+
+static struct intc_vect irq_vectors[] __initdata = {
+        INTC_VECT(IRQ0, 0x240), INTC_VECT(IRQ1, 0x280),
+        INTC_VECT(IRQ2, 0x2c0), INTC_VECT(IRQ3, 0x300),
+        INTC_VECT(IRQ4, 0x340), INTC_VECT(IRQ5, 0x380),
+        INTC_VECT(IRQ6, 0x3c0), INTC_VECT(IRQ7, 0x200),
+};
+
+static struct intc_mask_reg irq_mask_registers[] __initdata = {
+        { 0xffd00044, 0xffd00064, 32, /* INTMSK0 / INTMSKCLR0 */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static struct intc_prio_reg irq_prio_registers[] __initdata = {
+        { 0xffd00010, 0, 32, 4, /* INTPRI */ { IRQ0, IRQ1, IRQ2, IRQ3,
+                                               IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static struct intc_sense_reg irq_sense_registers[] __initdata = {
+        { 0xffd0001c, 32, 2, /* ICR1 */   { IRQ0, IRQ1, IRQ2, IRQ3,
+                                            IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static DECLARE_INTC_DESC(intc_irq_desc, "sh7763-irq", irq_vectors,
+                         NULL, NULL, irq_mask_registers, irq_prio_registers,
+                         irq_sense_registers);
+
+/* External interrupt pins in IRL mode */
+
+static struct intc_vect irl_vectors[] __initdata = {
+        INTC_VECT(IRL_LLLL, 0x200), INTC_VECT(IRL_LLLH, 0x220),
+        INTC_VECT(IRL_LLHL, 0x240), INTC_VECT(IRL_LLHH, 0x260),
+        INTC_VECT(IRL_LHLL, 0x280), INTC_VECT(IRL_LHLH, 0x2a0),
+        INTC_VECT(IRL_LHHL, 0x2c0), INTC_VECT(IRL_LHHH, 0x2e0),
+        INTC_VECT(IRL_HLLL, 0x300), INTC_VECT(IRL_HLLH, 0x320),
+        INTC_VECT(IRL_HLHL, 0x340), INTC_VECT(IRL_HLHH, 0x360),
+        INTC_VECT(IRL_HHLL, 0x380), INTC_VECT(IRL_HHLH, 0x3a0),
+        INTC_VECT(IRL_HHHL, 0x3c0),
+};
+
+static struct intc_mask_reg irl3210_mask_registers[] __initdata = {
+        { 0xffd40080, 0xffd40084, 32, /* INTMSK2 / INTMSKCLR2 */
+          { IRL_LLLL, IRL_LLLH, IRL_LLHL, IRL_LLHH,
+            IRL_LHLL, IRL_LHLH, IRL_LHHL, IRL_LHHH,
+            IRL_HLLL, IRL_HLLH, IRL_HLHL, IRL_HLHH,
+            IRL_HHLL, IRL_HHLH, IRL_HHHL, } },
+};
+
+static struct intc_mask_reg irl7654_mask_registers[] __initdata = {
+        { 0xffd40080, 0xffd40084, 32, /* INTMSK2 / INTMSKCLR2 */
+          { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            IRL_LLLL, IRL_LLLH, IRL_LLHL, IRL_LLHH,
+            IRL_LHLL, IRL_LHLH, IRL_LHHL, IRL_LHHH,
+            IRL_HLLL, IRL_HLLH, IRL_HLHL, IRL_HLHH,
+            IRL_HHLL, IRL_HHLH, IRL_HHHL, } },
+};
+
+static DECLARE_INTC_DESC(intc_irl7654_desc, "sh7763-irl7654", irl_vectors,
+                         NULL, NULL, irl7654_mask_registers, NULL, NULL);
+
+static DECLARE_INTC_DESC(intc_irl3210_desc, "sh7763-irl3210", irl_vectors,
+                         NULL, NULL, irl3210_mask_registers, NULL, NULL);
+
+#define INTC_ICR0       0xffd00000
+#define INTC_INTMSK0    0xffd00044
+#define INTC_INTMSK1    0xffd00048
+#define INTC_INTMSK2    0xffd40080
+#define INTC_INTMSKCLR1 0xffd00068
+#define INTC_INTMSKCLR2 0xffd40084
+
+void __init plat_irq_setup(void)
+{
+        /* disable IRQ7-0 */
+        ctrl_outl(0xff000000, INTC_INTMSK0);
+
+        /* disable IRL3-0 + IRL7-4 */
+        ctrl_outl(0xc0000000, INTC_INTMSK1);
+        ctrl_outl(0xfffefffe, INTC_INTMSK2);
+
+        register_intc_controller(&intc_desc);
+}
+
+void __init plat_irq_setup_pins(int mode)
+{
+        switch (mode) {
+        case IRQ_MODE_IRQ:
+                /* select IRQ mode for IRL3-0 + IRL7-4 */
+                ctrl_outl(ctrl_inl(INTC_ICR0) | 0x00c00000, INTC_ICR0);
+                register_intc_controller(&intc_irq_desc);
+                break;
+        case IRQ_MODE_IRL7654:
+                /* enable IRL7-4 but don't provide any masking */
+                ctrl_outl(0x40000000, INTC_INTMSKCLR1);
+                ctrl_outl(0x0000fffe, INTC_INTMSKCLR2);
+                break;
+        case IRQ_MODE_IRL3210:
+                /* enable IRL0-3 but don't provide any masking */
+                ctrl_outl(0x80000000, INTC_INTMSKCLR1);
+                ctrl_outl(0xfffe0000, INTC_INTMSKCLR2);
+                break;
+        case IRQ_MODE_IRL7654_MASK:
+                /* enable IRL7-4 and mask using cpu intc controller */
+                ctrl_outl(0x40000000, INTC_INTMSKCLR1);
+                register_intc_controller(&intc_irl7654_desc);
+                break;
+        case IRQ_MODE_IRL3210_MASK:
+                /* enable IRL0-3 and mask using cpu intc controller */
+                ctrl_outl(0x80000000, INTC_INTMSKCLR1);
+                register_intc_controller(&intc_irl3210_desc);
+                break;
+        default:
+                BUG();
+        }
+}
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index e8fd33ff0605..293004b526ff 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -168,11 +168,6 @@ static struct intc_group groups[] __initdata = {
         INTC_GROUP(GPIO, GPIOI0, GPIOI1, GPIOI2, GPIOI3),
 };
 
-static struct intc_prio priorities[] __initdata = {
-        INTC_PRIO(SCIF0, 3),
-        INTC_PRIO(SCIF1, 3),
-};
-
 static struct intc_mask_reg mask_registers[] __initdata = {
         { 0xffd40038, 0xffd4003c, 32, /* INT2MSKR / INT2MSKCR */
           { 0, 0, 0, 0, 0, 0, GPIO, FLCTL,
@@ -195,7 +190,7 @@ static struct intc_prio_reg prio_registers[] __initdata = {
         { 0xffd4001c, 0, 32, 8, /* INT2PRI7 */ { FLCTL, GPIO } },
 };
 
-static DECLARE_INTC_DESC(intc_desc, "sh7780", vectors, groups, priorities,
+static DECLARE_INTC_DESC(intc_desc, "sh7780", vectors, groups,
                          mask_registers, prio_registers, NULL);
 
 /* Support for external interrupt pins in IRQ mode */
@@ -223,7 +218,7 @@ static struct intc_sense_reg irq_sense_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_irq_desc, "sh7780-irq", irq_vectors,
-                         NULL, NULL, irq_mask_registers, irq_prio_registers,
+                         NULL, irq_mask_registers, irq_prio_registers,
                          irq_sense_registers);
 
 /* External interrupt pins in IRL mode */
@@ -257,10 +252,10 @@ static struct intc_mask_reg irl7654_mask_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_irl7654_desc, "sh7780-irl7654", irl_vectors,
-                         NULL, NULL, irl7654_mask_registers, NULL, NULL);
+                         NULL, irl7654_mask_registers, NULL, NULL);
 
 static DECLARE_INTC_DESC(intc_irl3210_desc, "sh7780-irl3210", irl_vectors,
-                         NULL, NULL, irl3210_mask_registers, NULL, NULL);
+                         NULL, irl3210_mask_registers, NULL, NULL);
 
 #define INTC_ICR0       0xffd00000
 #define INTC_INTMSK0    0xffd00044
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index 39b215d6cee5..74b60e96cdf4 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -178,15 +178,6 @@ static struct intc_group groups[] __initdata = {
         INTC_GROUP(GPIO, GPIOI0, GPIOI1, GPIOI2, GPIOI3),
 };
 
-static struct intc_prio priorities[] __initdata = {
-        INTC_PRIO(SCIF0, 3),
-        INTC_PRIO(SCIF1, 3),
-        INTC_PRIO(SCIF2, 3),
-        INTC_PRIO(SCIF3, 3),
-        INTC_PRIO(SCIF4, 3),
-        INTC_PRIO(SCIF5, 3),
-};
-
 static struct intc_mask_reg mask_registers[] __initdata = {
         { 0xffd00044, 0xffd00064, 32, /* INTMSK0 / INTMSKCLR0 */
           { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
@@ -227,7 +218,7 @@ static struct intc_prio_reg prio_registers[] __initdata = {
         { 0xffd40024, 0, 32, 8, /* INT2PRI9 */ { DU, GDTA, } },
 };
 
-static DECLARE_INTC_DESC(intc_desc, "sh7785", vectors, groups, priorities,
+static DECLARE_INTC_DESC(intc_desc, "sh7785", vectors, groups,
                          mask_registers, prio_registers, NULL);
 
 /* Support for external interrupt pins in IRQ mode */
@@ -248,11 +239,11 @@ static struct intc_sense_reg sense_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_irq0123, "sh7785-irq0123", vectors_irq0123,
-                         NULL, NULL, mask_registers, prio_registers,
+                         NULL, mask_registers, prio_registers,
                          sense_registers);
 
 static DECLARE_INTC_DESC(intc_desc_irq4567, "sh7785-irq4567", vectors_irq4567,
-                         NULL, NULL, mask_registers, prio_registers,
+                         NULL, mask_registers, prio_registers,
                          sense_registers);
 
 /* External interrupt pins in IRL mode */
@@ -280,10 +271,10 @@ static struct intc_vect vectors_irl4567[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_irl0123, "sh7785-irl0123", vectors_irl0123,
-                         NULL, NULL, mask_registers, NULL, NULL);
+                         NULL, mask_registers, NULL, NULL);
 
 static DECLARE_INTC_DESC(intc_desc_irl4567, "sh7785-irl4567", vectors_irl4567,
-                         NULL, NULL, mask_registers, NULL, NULL);
+                         NULL, mask_registers, NULL, NULL);
 
 #define INTC_ICR0       0xffd00000
 #define INTC_INTMSK0    0xffd00044
diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index c6cdd7e3b049..4dc958b6b314 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -165,13 +165,6 @@ static struct intc_group groups[] __initdata = {
         INTC_GROUP(DTU3, DTU3_TEND, DTU3_AE, DTU3_TMISS),
 };
 
-static struct intc_prio priorities[] __initdata = {
-        INTC_PRIO(SCIF0, 3),
-        INTC_PRIO(SCIF1, 3),
-        INTC_PRIO(SCIF2, 3),
-        INTC_PRIO(SCIF3, 3),
-};
-
 static struct intc_mask_reg mask_registers[] __initdata = {
         { 0xfe410030, 0xfe410050, 32, /* CnINTMSK0 / CnINTMSKCLR0 */
           { IRQ0, IRQ1, IRQ2, IRQ3 } },
@@ -218,7 +211,7 @@ static struct intc_prio_reg prio_registers[] __initdata = {
             INTICI3, INTICI2, INTICI1, INTICI0 }, INTC_SMP(4, 4) },
 };
 
-static DECLARE_INTC_DESC(intc_desc, "shx3", vectors, groups, priorities,
+static DECLARE_INTC_DESC(intc_desc, "shx3", vectors, groups,
                          mask_registers, prio_registers, NULL);
 
 /* Support for external interrupt pins in IRQ mode */
@@ -232,8 +225,7 @@ static struct intc_sense_reg sense_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_irq, "shx3-irq", vectors_irq, groups,
-                         priorities, mask_registers, prio_registers,
-                         sense_registers);
+                         mask_registers, prio_registers, sense_registers);
 
 /* External interrupt pins in IRL mode */
 static struct intc_vect vectors_irl[] __initdata = {
@@ -248,7 +240,7 @@ static struct intc_vect vectors_irl[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_desc_irl, "shx3-irl", vectors_irl, groups,
-                         priorities, mask_registers, prio_registers, NULL);
+                         mask_registers, prio_registers, NULL);
 
 void __init plat_irq_setup_pins(int mode)
 {
diff --git a/arch/sh/kernel/cpu/sh5/Makefile b/arch/sh/kernel/cpu/sh5/Makefile
new file mode 100644
index 000000000000..8646363e9ded
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh5/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the Linux/SuperH SH-5 backends.
+#
+obj-y := entry.o probe.o switchto.o
+
+obj-$(CONFIG_SH_FPU)            += fpu.o
+obj-$(CONFIG_KALLSYMS)          += unwind.o
diff --git a/arch/sh64/kernel/entry.S b/arch/sh/kernel/cpu/sh5/entry.S
index 7013fcb6665c..ba8750176d91 100644
--- a/arch/sh64/kernel/entry.S
+++ b/arch/sh/kernel/cpu/sh5/entry.S
@@ -1,21 +1,18 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/entry.S
+ * arch/sh/kernel/cpu/sh5/entry.S
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2004, 2005  Paul Mundt
- * Copyright (C) 2003, 2004 Richard Curnow
+ * Copyright (C) 2004 - 2007  Paul Mundt
+ * Copyright (C) 2003, 2004  Richard Curnow
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #include <linux/errno.h>
 #include <linux/sys.h>
-
+#include <asm/cpu/registers.h>
 #include <asm/processor.h>
-#include <asm/registers.h>
 #include <asm/unistd.h>
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
@@ -163,7 +160,7 @@ trap_jtable:
         .long   system_call                             /* 0x160 */
         .long   do_reserved_inst                /* 0x180 */
         .long   do_illegal_slot_inst    /* 0x1A0 */
-        .long   do_NMI                  /* 0x1C0 */
+        .long   do_exception_error              /* 0x1C0 - NMI */
         .long   do_exception_error              /* 0x1E0 */
         .rept 15
                 .long do_IRQ            /* 0x200 - 0x3C0 */
@@ -434,7 +431,7 @@ reset_or_panic:
         synco   /* TAKum03020 (but probably a good idea anyway.) */
         putcon  SP, DCR
         /* First save r0-1 and tr0, as we need to use these */
-        movi    resvec_save_area-CONFIG_CACHED_MEMORY_OFFSET, SP
+        movi    resvec_save_area-CONFIG_PAGE_OFFSET, SP
         st.q    SP, 0, r0
         st.q    SP, 8, r1
         gettr   tr0, r0
@@ -444,7 +441,7 @@ reset_or_panic:
         getcon  EXPEVT, r0
         movi    RESET_CAUSE, r1
         sub     r1, r0, r1              /* r1=0 if reset */
-        movi    _stext-CONFIG_CACHED_MEMORY_OFFSET, r0
+        movi    _stext-CONFIG_PAGE_OFFSET, r0
         ori     r0, 1, r0
         ptabs   r0, tr0
         beqi    r1, 0, tr0              /* Jump to start address if reset */
@@ -456,7 +453,7 @@ reset_or_panic:
         beqi    r1, 0, tr0              /* jump if single step */
 
         /* Now jump to where we save the registers. */
-        movi    panic_stash_regs-CONFIG_CACHED_MEMORY_OFFSET, r1
+        movi    panic_stash_regs-CONFIG_PAGE_OFFSET, r1
         ptabs   r1, tr0
         blink   tr0, r63
 
@@ -492,7 +489,7 @@ debug_exception:
          */
         putcon  SP, DCR
         /* Save SSR & SPC, together with R0 & R1, as we need to use 2 regs. */
-        movi    resvec_save_area-CONFIG_CACHED_MEMORY_OFFSET, SP
+        movi    resvec_save_area-CONFIG_PAGE_OFFSET, SP
 
         /* With the MMU off, we are bypassing the cache, so purge any
          * data that will be made stale by the following stores.
@@ -560,7 +557,7 @@ debug_interrupt:
         /* Save original stack pointer into KCR1 */
         synco
         putcon  SP, KCR1
-        movi    resvec_save_area-CONFIG_CACHED_MEMORY_OFFSET, SP
+        movi    resvec_save_area-CONFIG_PAGE_OFFSET, SP
         ocbp    SP, 0
         ocbp    SP, 32
         synco
@@ -609,7 +606,7 @@ debug_interrupt:
         movi    EVENT_FAULT_NOT_TLB, r4
 
         or      SP, ZERO, r5
-        movi    CONFIG_CACHED_MEMORY_OFFSET, r6
+        movi    CONFIG_PAGE_OFFSET, r6
         add     r6, r5, r5
         getcon  KCR1, SP
 
@@ -944,9 +941,6 @@ ret_with_reschedule:
         getcon  KCR0, r6                ! r6 contains current_thread_info
         ld.l    r6, TI_FLAGS, r7        ! r7 contains current_thread_info->flags
 
-        ! FIXME:!!!
-        ! no handling of TIF_SYSCALL_TRACE yet!!
-
         movi    _TIF_NEED_RESCHED, r8
         and     r8, r7, r8
         pta     work_resched, tr0
@@ -1282,14 +1276,17 @@ syscall_allowed:
 
         getcon  KCR0, r2
         ld.l    r2, TI_FLAGS, r4
-        movi    (1 << TIF_SYSCALL_TRACE), r6
+        movi    (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | _TIF_SYSCALL_AUDIT), r6
         and     r6, r4, r6
         beq/l   r6, ZERO, tr0
 
         /* Trace it by calling syscall_trace before and after */
         movi    syscall_trace, r4
+        or      SP, ZERO, r2
+        or      ZERO, ZERO, r3
         ptabs   r4, tr0
         blink   tr0, LINK
+
         /* Reload syscall number as r5 is trashed by syscall_trace */
         ld.q    SP, FRAME_S(FSYSCALL_ID), r5
         andi    r5, 0x1ff, r5
@@ -1323,6 +1320,8 @@ syscall_ret_trace:
         st.q    SP, FRAME_R(9), r2      /* Save return value */
 
         movi    syscall_trace, LINK
+        or      SP, ZERO, r2
+        movi    1, r3
         ptabs   LINK, tr0
         blink   tr0, LINK
 
@@ -1368,7 +1367,7 @@ route_to_panic_handler:
            last-chance debugging, e.g. if no output wants to go to the console.
            */
 
-        movi    panic_handler - CONFIG_CACHED_MEMORY_OFFSET, r1
+        movi    panic_handler - CONFIG_PAGE_OFFSET, r1
         ptabs   r1, tr0
         pta     1f, tr1
         gettr   tr1, r0
@@ -1410,7 +1409,7 @@ peek_real_address_q:
         andc    r1, r36, r1     /* turn sr.mmu off in real mode section */
 
         putcon  r1, ssr
-        movi    .peek0 - CONFIG_CACHED_MEMORY_OFFSET, r36 /* real mode target address */
+        movi    .peek0 - CONFIG_PAGE_OFFSET, r36 /* real mode target address */
         movi    1f, r37         /* virtual mode return addr */
         putcon  r36, spc
 
@@ -1459,7 +1458,7 @@ poke_real_address_q:
         andc    r1, r36, r1     /* turn sr.mmu off in real mode section */
 
         putcon  r1, ssr
-        movi    .poke0-CONFIG_CACHED_MEMORY_OFFSET, r36 /* real mode target address */
+        movi    .poke0-CONFIG_PAGE_OFFSET, r36 /* real mode target address */
         movi    1f, r37         /* virtual mode return addr */
         putcon  r36, spc
 
@@ -1956,7 +1955,7 @@ panic_stash_regs:
         getcon  SSR,r3
         getcon  EXPEVT,r4
         /* Prepare to jump to C - physical address */
-        movi    panic_handler-CONFIG_CACHED_MEMORY_OFFSET, r1
+        movi    panic_handler-CONFIG_PAGE_OFFSET, r1
         ori     r1, 1, r1
         ptabs   r1, tr0
         getcon  DCR, SP
@@ -2057,7 +2056,7 @@ trap_init:
         andi    r19, -4, r19                    /* reset MMUOFF + reserved */
         /* For RESVEC exceptions we force the MMU off, which means we need the
            physical address. */
-        movi    LRESVEC_block-CONFIG_CACHED_MEMORY_OFFSET, r20
+        movi    LRESVEC_block-CONFIG_PAGE_OFFSET, r20
         andi    r20, -4, r20                    /* reset reserved */
         ori     r20, 1, r20                     /* set MMUOFF */
         putcon  r19, VBR
diff --git a/arch/sh64/kernel/fpu.c b/arch/sh/kernel/cpu/sh5/fpu.c
index 8ad4ed6a6c9b..30b76a94abf2 100644
--- a/arch/sh64/kernel/fpu.c
+++ b/arch/sh/kernel/cpu/sh5/fpu.c
@@ -1,9 +1,5 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/fpu.c
+ * arch/sh/kernel/cpu/sh5/fpu.c
  *
  * Copyright (C) 2001  Manuela Cirronis, Paolo Alberelli
  * Copyright (C) 2002  STMicroelectronics Limited
@@ -12,8 +8,10 @@
  * Started from SH4 version:
  *   Copyright (C) 1999, 2000  Kaz Kojima & Niibe Yutaka
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <asm/processor.h>
@@ -30,12 +28,12 @@
 
 static union sh_fpu_union init_fpuregs = {
         .hard = {
-          .fp_regs = { [0 ... 63] = sNAN32 },
-          .fpscr = FPSCR_INIT
+                .fp_regs = { [0 ... 63] = sNAN32 },
+                .fpscr = FPSCR_INIT
         }
 };
 
-inline void fpsave(struct sh_fpu_hard_struct *fpregs)
+void save_fpu(struct task_struct *tsk, struct pt_regs *regs)
 {
         asm volatile("fst.p     %0, (0*8), fp0\n\t"
                      "fst.p     %0, (1*8), fp2\n\t"
@@ -73,11 +71,10 @@ inline void fpsave(struct sh_fpu_hard_struct *fpregs)
                      "fgetscr   fr63\n\t"
                      "fst.s     %0, (32*8), fr63\n\t"
                 : /* no output */
-                : "r" (fpregs)
+                : "r" (&tsk->thread.fpu.hard)
                 : "memory");
 }
 
-
 static inline void
 fpload(struct sh_fpu_hard_struct *fpregs)
 {
@@ -152,11 +149,11 @@ do_fpu_state_restore(unsigned long ex, struct pt_regs *regs)
         if (last_task_used_math == current)
                 return;
 
-        grab_fpu();
-        if (last_task_used_math != NULL) {
+        enable_fpu();
+        if (last_task_used_math != NULL)
                 /* Other processes fpu state, save away */
-                fpsave(&last_task_used_math->thread.fpu.hard);
-        }
+                save_fpu(last_task_used_math, regs);
+
         last_task_used_math = current;
         if (used_math()) {
                 fpload(&current->thread.fpu.hard);
@@ -165,6 +162,5 @@ do_fpu_state_restore(unsigned long ex, struct pt_regs *regs)
                 fpload(&init_fpuregs.hard);
                 set_used_math();
         }
-        release_fpu();
+        disable_fpu();
 }
-
diff --git a/arch/sh/kernel/cpu/sh5/probe.c b/arch/sh/kernel/cpu/sh5/probe.c
new file mode 100644
index 000000000000..15d167fd0ae7
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh5/probe.c
@@ -0,0 +1,76 @@
+/*
+ * arch/sh/kernel/cpu/sh5/probe.c
+ *
+ * CPU Subtype Probing for SH-5.
+ *
+ * Copyright (C) 2000, 2001  Paolo Alberelli
+ * Copyright (C) 2003 - 2007  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/string.h>
+#include <asm/processor.h>
+#include <asm/cache.h>
+
+int __init detect_cpu_and_cache_system(void)
+{
+        unsigned long long cir;
+
+        /* Do peeks in real mode to avoid having to set up a mapping for the
+           WPC registers. On SH5-101 cut2, such a mapping would be exposed to
+           an address translation erratum which would make it hard to set up
+           correctly. */
+        cir = peek_real_address_q(0x0d000008);
+        if ((cir & 0xffff) == 0x5103) {
+                boot_cpu_data.type = CPU_SH5_103;
+        } else if (((cir >> 32) & 0xffff) == 0x51e2) {
+                /* CPU.VCR aliased at CIR address on SH5-101 */
+                boot_cpu_data.type = CPU_SH5_101;
+        } else {
+                boot_cpu_data.type = CPU_SH_NONE;
+        }
+
+        /*
+         * First, setup some sane values for the I-cache.
+         */
+        boot_cpu_data.icache.ways               = 4;
+        boot_cpu_data.icache.sets               = 256;
+        boot_cpu_data.icache.linesz             = L1_CACHE_BYTES;
+
+#if 0
+        /*
+         * FIXME: This can probably be cleaned up a bit as well.. for example,
+         * do we really need the way shift _and_ the way_step_shift ?? Judging
+         * by the existing code, I would guess no.. is there any valid reason
+         * why we need to be tracking this around?
+         */
+        boot_cpu_data.icache.way_shift          = 13;
+        boot_cpu_data.icache.entry_shift        = 5;
+        boot_cpu_data.icache.set_shift          = 4;
+        boot_cpu_data.icache.way_step_shift     = 16;
+        boot_cpu_data.icache.asid_shift         = 2;
+
+        /*
+         * way offset = cache size / associativity, so just don't factor in
+         * associativity in the first place..
+         */
+        boot_cpu_data.icache.way_ofs    = boot_cpu_data.icache.sets *
+                                          boot_cpu_data.icache.linesz;
+
+        boot_cpu_data.icache.asid_mask          = 0x3fc;
+        boot_cpu_data.icache.idx_mask           = 0x1fe0;
+        boot_cpu_data.icache.epn_mask           = 0xffffe000;
+#endif
+
+        boot_cpu_data.icache.flags              = 0;
+
+        /* A trivial starting point.. */
+        memcpy(&boot_cpu_data.dcache,
+               &boot_cpu_data.icache, sizeof(struct cache_info));
+
+        return 0;
+}
diff --git a/arch/sh64/kernel/switchto.S b/arch/sh/kernel/cpu/sh5/switchto.S
index 45b2d90eed7d..45c351b0f1ba 100644
--- a/arch/sh64/kernel/switchto.S
+++ b/arch/sh/kernel/cpu/sh5/switchto.S
@@ -1,5 +1,5 @@
 /*
- * arch/sh64/kernel/switchto.S
+ * arch/sh/kernel/cpu/sh5/switchto.S
  *
  * sh64 context switch
  *
diff --git a/arch/sh64/kernel/unwind.c b/arch/sh/kernel/cpu/sh5/unwind.c
index 1214c78e3584..119c20afd4e5 100644
--- a/arch/sh64/kernel/unwind.c
+++ b/arch/sh/kernel/cpu/sh5/unwind.c
@@ -1,5 +1,5 @@
 /*
- * arch/sh64/kernel/unwind.c
+ * arch/sh/kernel/cpu/sh5/unwind.c
  *
  * Copyright (C) 2004  Paul Mundt
  * Copyright (C) 2004  Richard Curnow
diff --git a/arch/sh/kernel/dump_task.c b/arch/sh/kernel/dump_task.c
new file mode 100644
index 000000000000..4a8a4083ff0b
--- /dev/null
+++ b/arch/sh/kernel/dump_task.c
@@ -0,0 +1,31 @@
+#include <linux/elfcore.h>
+#include <linux/sched.h>
+
+/*
+ * Capture the user space registers if the task is not running (in user space)
+ */
+int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
+{
+        struct pt_regs ptregs;
+
+        ptregs = *task_pt_regs(tsk);
+        elf_core_copy_regs(regs, &ptregs);
+
+        return 1;
+}
+
+int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpu)
+{
+        int fpvalid = 0;
+
+#if defined(CONFIG_SH_FPU)
+        fpvalid = !!tsk_used_math(tsk);
+        if (fpvalid) {
+                unlazy_fpu(tsk, task_pt_regs(tsk));
+                memcpy(fpu, &tsk->thread.fpu.hard, sizeof(*fpu));
+        }
+#endif
+
+        return fpvalid;
+}
+
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index 2f30977558ad..957f25611543 100644
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
@@ -63,7 +63,8 @@ static struct console bios_console = {
 #include <linux/serial_core.h>
 #include "../../../drivers/serial/sh-sci.h"
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7720)
+#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)
 #define EPK_SCSMR_VALUE 0x000
 #define EPK_SCBRR_VALUE 0x00C
 #define EPK_FIFO_SIZE 64
@@ -117,7 +118,8 @@ static struct console scif_console = {
 };
 
 #if !defined(CONFIG_SH_STANDARD_BIOS)
-#if defined(CONFIG_CPU_SUBTYPE_SH7720)
+#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)
 static void scif_sercon_init(char *s)
 {
         sci_out(&scif_port, SCSCR, 0x0000);     /* clear TE and RE */
@@ -208,10 +210,12 @@ static int __init setup_early_printk(char *buf)
         if (!strncmp(buf, "serial", 6)) {
                 early_console = &scif_console;
 
-#if (defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SUBTYPE_SH7720)) && \
-    !defined(CONFIG_SH_STANDARD_BIOS)
+#if !defined(CONFIG_SH_STANDARD_BIOS)
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)
                 scif_sercon_init(buf + 6);
 #endif
+#endif
         }
 #endif
 
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S
index e0317ed080c3..926b2e7b11c1 100644
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
@@ -176,25 +176,6 @@ work_notifysig:
         jmp     @r1
          lds    r0, pr
 work_resched:
-#if defined(CONFIG_GUSA) && !defined(CONFIG_PREEMPT)
-        ! gUSA handling
-        mov.l   @(OFF_SP,r15), r0       ! get user space stack pointer
-        mov     r0, r1
-        shll    r0
-        bf/s    1f
-         shll   r0
-        bf/s    1f
-         mov    #OFF_PC, r0
-        !                                 SP >= 0xc0000000 : gUSA mark
-        mov.l   @(r0,r15), r2           ! get user space PC (program counter)
-        mov.l   @(OFF_R0,r15), r3       ! end point
-        cmp/hs  r3, r2                  ! r2 >= r3? 
-        bt      1f
-        add     r3, r1                  ! rewind point #2
-        mov.l   r1, @(r0,r15)           ! reset PC to rewind point #2
-        !
-1:
-#endif
         mov.l   1f, r1
         jsr     @r1                             ! schedule
          nop
@@ -224,7 +205,7 @@ work_resched:
 syscall_exit_work:
         ! r0: current_thread_info->flags
         ! r8: current_thread_info
-        tst     #_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP, r0
+        tst     #_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | _TIF_SYSCALL_AUDIT, r0
         bt/s    work_pending
          tst    #_TIF_NEED_RESCHED, r0
 #ifdef CONFIG_TRACE_IRQFLAGS
@@ -234,6 +215,8 @@ syscall_exit_work:
 #endif
         sti
         ! XXX setup arguments...
+        mov     r15, r4
+        mov     #1, r5
         mov.l   4f, r0                  ! do_syscall_trace
         jsr     @r0
          nop
@@ -244,6 +227,8 @@ syscall_exit_work:
 syscall_trace_entry:
         !                       Yes it is traced.
         ! XXX setup arguments...
+        mov     r15, r4
+        mov     #0, r5
         mov.l   4f, r11         ! Call do_syscall_trace which notifies
         jsr     @r11            ! superior (will chomp R[0-7])
          nop
@@ -366,7 +351,7 @@ ENTRY(system_call)
         !
         get_current_thread_info r8, r10
         mov.l   @(TI_FLAGS,r8), r8
-        mov     #_TIF_SYSCALL_TRACE, r10
+        mov     #(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT), r10
         tst     r10, r8
         bf      syscall_trace_entry
         !
diff --git a/arch/sh/kernel/head.S b/arch/sh/kernel/head_32.S
index 3338239717f1..d67d7ed09f22 100644
--- a/arch/sh/kernel/head.S
+++ b/arch/sh/kernel/head_32.S
@@ -32,7 +32,11 @@ ENTRY(empty_zero_page)
         .long   1               /* LOADER_TYPE */
         .long   0x00360000      /* INITRD_START */
         .long   0x000a0000      /* INITRD_SIZE */
-        .long   0
+#ifdef CONFIG_32BIT
+        .long   0x53453f00 + 32 /* "SE?" = 32 bit */
+#else
+        .long   0x53453f00 + 29 /* "SE?" = 29 bit */
+#endif
 1:
         .skip   PAGE_SIZE - empty_zero_page - 1b
 
diff --git a/arch/sh64/kernel/head.S b/arch/sh/kernel/head_64.S
index 186406d3ad9c..f42d4c0feb76 100644
--- a/arch/sh64/kernel/head.S
+++ b/arch/sh/kernel/head_64.S
@@ -1,32 +1,18 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/head.S
+ * arch/sh/kernel/head_64.S
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003, 2004  Paul Mundt
  *
- *
- * benedict.gaster@superh.com:   2nd May 2002
- *    Moved definition of empty_zero_page to its own section allowing
- *    it to be placed at an absolute address known at load time.
- *
- * lethal@linux-sh.org:          9th May 2003
- *    Kill off GLOBAL_NAME() usage.
- *
- * lethal@linux-sh.org:          8th May 2004
- *    Add early SCIF console DTLB mapping.
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
-
 #include <asm/page.h>
-#include <asm/mmu_context.h>
 #include <asm/cache.h>
 #include <asm/tlb.h>
-#include <asm/processor.h>
-#include <asm/registers.h>
+#include <asm/cpu/registers.h>
+#include <asm/cpu/mmu_context.h>
 #include <asm/thread_info.h>
 
 /*
@@ -41,9 +27,9 @@
 #define MMUDR_END       DTLB_LAST_VAR_UNRESTRICTED+TLB_STEP
 #define MMUDR_STEP      TLB_STEP
 
-/* Safety check : CONFIG_CACHED_MEMORY_OFFSET has to be a multiple of 512Mb */
-#if (CONFIG_CACHED_MEMORY_OFFSET & ((1UL<<29)-1))
-#error "CONFIG_CACHED_MEMORY_OFFSET must be a multiple of 512Mb"
+/* Safety check : CONFIG_PAGE_OFFSET has to be a multiple of 512Mb */
+#if (CONFIG_PAGE_OFFSET & ((1UL<<29)-1))
+#error "CONFIG_PAGE_OFFSET must be a multiple of 512Mb"
 #endif
 
 /*
@@ -52,7 +38,7 @@
 /* Deal safely with the case where the base of RAM is not 512Mb aligned */
 
 #define ALIGN_512M_MASK (0xffffffffe0000000)
-#define ALIGNED_EFFECTIVE ((CONFIG_CACHED_MEMORY_OFFSET + CONFIG_MEMORY_START) & ALIGN_512M_MASK)
+#define ALIGNED_EFFECTIVE ((CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START) & ALIGN_512M_MASK)
 #define ALIGNED_PHYSICAL (CONFIG_MEMORY_START & ALIGN_512M_MASK)
 
 #define MMUIR_TEXT_H    (0x0000000000000003 | ALIGNED_EFFECTIVE)
@@ -66,23 +52,23 @@
 #define MMUDR_CACHED_L  0x000000000000015a | ALIGNED_PHYSICAL
                         /* 512 Mb, Cacheable, Write-back, read/write, Not User, Ph. Add. */
 
-#ifdef CONFIG_ICACHE_DISABLED
+#ifdef CONFIG_CACHE_OFF
 #define ICCR0_INIT_VAL  ICCR0_OFF                       /* ICACHE off */
 #else
 #define ICCR0_INIT_VAL  ICCR0_ON | ICCR0_ICI            /* ICE + ICI */
 #endif
 #define ICCR1_INIT_VAL  ICCR1_NOLOCK                    /* No locking */
 
-#if defined (CONFIG_DCACHE_DISABLED)
+#if defined (CONFIG_CACHE_OFF)
 #define OCCR0_INIT_VAL  OCCR0_OFF                          /* D-cache: off  */
-#elif defined (CONFIG_DCACHE_WRITE_THROUGH)
+#elif defined (CONFIG_CACHE_WRITETHROUGH)
 #define OCCR0_INIT_VAL  OCCR0_ON | OCCR0_OCI | OCCR0_WT    /* D-cache: on,   */
                                                            /* WT, invalidate */
-#elif defined (CONFIG_DCACHE_WRITE_BACK)
+#elif defined (CONFIG_CACHE_WRITEBACK)
 #define OCCR0_INIT_VAL  OCCR0_ON | OCCR0_OCI | OCCR0_WB    /* D-cache: on,   */
                                                            /* WB, invalidate */
 #else
-#error preprocessor flag CONFIG_DCACHE_... not recognized!
+#error preprocessor flag CONFIG_CACHE_... not recognized!
 #endif
 
 #define OCCR1_INIT_VAL  OCCR1_NOLOCK                       /* No locking     */
@@ -108,8 +94,8 @@ empty_zero_page:
         .section        .data, "aw"
         .balign PAGE_SIZE
 
-        .global swapper_pg_dir
-swapper_pg_dir:
+        .global mmu_pdtp_cache
+mmu_pdtp_cache:
         .space PAGE_SIZE, 0
 
         .global empty_bad_page
@@ -368,5 +354,3 @@ hopeless:
          * (r32) _start_kernel address
          */
         blink   tr7, ZERO
-
-
diff --git a/arch/sh/kernel/init_task.c b/arch/sh/kernel/init_task.c
index 4b449c4a6bad..f9bcc606127e 100644
--- a/arch/sh/kernel/init_task.c
+++ b/arch/sh/kernel/init_task.c
@@ -11,8 +11,8 @@ static struct fs_struct init_fs = INIT_FS;
 static struct files_struct init_files = INIT_FILES;
 static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
 static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
+struct pt_regs fake_swapper_regs;
 struct mm_struct init_mm = INIT_MM(init_mm);
-
 EXPORT_SYMBOL(init_mm);
 
 /*
@@ -22,7 +22,7 @@ EXPORT_SYMBOL(init_mm);
  * way process stacks are handled. This is done by having a special
  * "init_task" linker map entry..
  */
-union thread_union init_thread_union 
+union thread_union init_thread_union
         __attribute__((__section__(".data.init_task"))) =
                 { INIT_THREAD_INFO(init_task) };
 
diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c
index 501fe03e3715..71c9fde2fd90 100644
--- a/arch/sh/kernel/io.c
+++ b/arch/sh/kernel/io.c
@@ -61,73 +61,6 @@ void memset_io(volatile void __iomem *dst, int c, unsigned long count)
 }
 EXPORT_SYMBOL(memset_io);
 
-void __raw_readsl(unsigned long addr, void *datap, int len)
-{
-        u32 *data;
-
-        for (data = datap; (len != 0) && (((u32)data & 0x1f) != 0); len--)
-                *data++ = ctrl_inl(addr);
-
-        if (likely(len >= (0x20 >> 2))) {
-                int tmp2, tmp3, tmp4, tmp5, tmp6;
-
-                __asm__ __volatile__(
-                        "1:                     \n\t"
-                        "mov.l  @%7, r0         \n\t"
-                        "mov.l  @%7, %2         \n\t"
-#ifdef CONFIG_CPU_SH4
-                        "movca.l r0, @%0        \n\t"
-#else
-                        "mov.l  r0, @%0         \n\t"
-#endif
-                        "mov.l  @%7, %3         \n\t"
-                        "mov.l  @%7, %4         \n\t"
-                        "mov.l  @%7, %5         \n\t"
-                        "mov.l  @%7, %6         \n\t"
-                        "mov.l  @%7, r7         \n\t"
-                        "mov.l  @%7, r0         \n\t"
-                        "mov.l  %2, @(0x04,%0)  \n\t"
-                        "mov    #0x20>>2, %2    \n\t"
-                        "mov.l  %3, @(0x08,%0)  \n\t"
-                        "sub    %2, %1          \n\t"
-                        "mov.l  %4, @(0x0c,%0)  \n\t"
-                        "cmp/hi %1, %2          ! T if 32 > len \n\t"
-                        "mov.l  %5, @(0x10,%0)  \n\t"
-                        "mov.l  %6, @(0x14,%0)  \n\t"
-                        "mov.l  r7, @(0x18,%0)  \n\t"
-                        "mov.l  r0, @(0x1c,%0)  \n\t"
-                        "bf.s   1b              \n\t"
-                        " add   #0x20, %0       \n\t"
-                        : "=&r" (data), "=&r" (len),
-                          "=&r" (tmp2), "=&r" (tmp3), "=&r" (tmp4),
-                          "=&r" (tmp5), "=&r" (tmp6)
-                        : "r"(addr), "0" (data), "1" (len)
-                        : "r0", "r7", "t", "memory");
-        }
-
-        for (; len != 0; len--)
-                *data++ = ctrl_inl(addr);
-}
-EXPORT_SYMBOL(__raw_readsl);
-
-void __raw_writesl(unsigned long addr, const void *data, int len)
-{
-        if (likely(len != 0)) {
-                int tmp1;
-
-                __asm__ __volatile__ (
-                        "1:                             \n\t"
-                        "mov.l  @%0+, %1        \n\t"
-                        "dt             %3              \n\t"
-                        "bf.s           1b              \n\t"
-                        " mov.l %1, @%4         \n\t"
-                        : "=&r" (data), "=&r" (tmp1)
-                        : "0" (data), "r" (len), "r"(addr)
-                        : "t", "memory");
-        }
-}
-EXPORT_SYMBOL(__raw_writesl);
-
 void __iomem *ioport_map(unsigned long port, unsigned int nr)
 {
         return sh_mv.mv_ioport_map(port, nr);
diff --git a/arch/sh/kernel/module.c b/arch/sh/kernel/module.c
index 142a4e5b7ebc..b3d0a03b4c76 100644
--- a/arch/sh/kernel/module.c
+++ b/arch/sh/kernel/module.c
@@ -1,5 +1,15 @@
 /*  Kernel module help for SH.
 
+    SHcompact version by Kaz Kojima and Paul Mundt.
+
+    SHmedia bits:
+
+        Copyright 2004 SuperH (UK) Ltd
+        Author: Richard Curnow
+
+        Based on the sh version, and on code from the sh64-specific parts of
+        modutils, originally written by Richard Curnow and Ben Gaster.
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -21,12 +31,6 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(fmt...)
-#endif
-
 void *module_alloc(unsigned long size)
 {
         if (size == 0)
@@ -52,6 +56,7 @@ int module_frob_arch_sections(Elf_Ehdr *hdr,
         return 0;
 }
 
+#ifdef CONFIG_SUPERH32
 #define COPY_UNALIGNED_WORD(sw, tw, align) \
 { \
         void *__s = &(sw), *__t = &(tw); \
@@ -74,6 +79,10 @@ int module_frob_arch_sections(Elf_Ehdr *hdr,
                 break; \
         } \
 }
+#else
+/* One thing SHmedia doesn't screw up! */
+#define COPY_UNALIGNED_WORD(sw, tw, align)      { (tw) = (sw); }
+#endif
 
 int apply_relocate_add(Elf32_Shdr *sechdrs,
                    const char *strtab,
@@ -89,8 +98,8 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
         uint32_t value;
         int align;
 
-        DEBUGP("Applying relocate section %u to %u\n", relsec,
-               sechdrs[relsec].sh_info);
+        pr_debug("Applying relocate section %u to %u\n", relsec,
+                 sechdrs[relsec].sh_info);
         for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
                 /* This is where to make the change */
                 location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
@@ -102,17 +111,44 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
                 relocation = sym->st_value + rel[i].r_addend;
                 align = (int)location & 3;
 
+#ifdef CONFIG_SUPERH64
+                /* For text addresses, bit2 of the st_other field indicates
+                 * whether the symbol is SHmedia (1) or SHcompact (0).  If
+                 * SHmedia, the LSB of the symbol needs to be asserted
+                 * for the CPU to be in SHmedia mode when it starts executing
+                 * the branch target. */
+                relocation |= (sym->st_other & 4);
+#endif
+
                 switch (ELF32_R_TYPE(rel[i].r_info)) {
                 case R_SH_DIR32:
-                        COPY_UNALIGNED_WORD (*location, value, align);
+                        COPY_UNALIGNED_WORD (*location, value, align);
                         value += relocation;
-                        COPY_UNALIGNED_WORD (value, *location, align);
+                        COPY_UNALIGNED_WORD (value, *location, align);
                         break;
                 case R_SH_REL32:
-                        relocation = (relocation - (Elf32_Addr) location);
-                        COPY_UNALIGNED_WORD (*location, value, align);
+                        relocation = (relocation - (Elf32_Addr) location);
+                        COPY_UNALIGNED_WORD (*location, value, align);
                         value += relocation;
-                        COPY_UNALIGNED_WORD (value, *location, align);
+                        COPY_UNALIGNED_WORD (value, *location, align);
+                        break;
+                case R_SH_IMM_LOW16:
+                        *location = (*location & ~0x3fffc00) |
+                                ((relocation & 0xffff) << 10);
+                        break;
+                case R_SH_IMM_MEDLOW16:
+                        *location = (*location & ~0x3fffc00) |
+                                (((relocation >> 16) & 0xffff) << 10);
+                        break;
+                case R_SH_IMM_LOW16_PCREL:
+                        relocation -= (Elf32_Addr) location;
+                        *location = (*location & ~0x3fffc00) |
+                                ((relocation & 0xffff) << 10);
+                        break;
+                case R_SH_IMM_MEDLOW16_PCREL:
+                        relocation -= (Elf32_Addr) location;
+                        *location = (*location & ~0x3fffc00) |
+                                (((relocation >> 16) & 0xffff) << 10);
                         break;
                 default:
                         printk(KERN_ERR "module %s: Unknown relocation: %u\n",
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process_32.c
index 6d7f2b07e491..9ab1926b9d10 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process_32.c
@@ -230,34 +230,6 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
         return fpvalid;
 }
 
-/*
- * Capture the user space registers if the task is not running (in user space)
- */
-int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
-{
-        struct pt_regs ptregs;
-
-        ptregs = *task_pt_regs(tsk);
-        elf_core_copy_regs(regs, &ptregs);
-
-        return 1;
-}
-
-int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpu)
-{
-        int fpvalid = 0;
-
-#if defined(CONFIG_SH_FPU)
-        fpvalid = !!tsk_used_math(tsk);
-        if (fpvalid) {
-                unlazy_fpu(tsk, task_pt_regs(tsk));
-                memcpy(fpu, &tsk->thread.fpu.hard, sizeof(*fpu));
-        }
-#endif
-
-        return fpvalid;
-}
-
 asmlinkage void ret_from_fork(void);
 
 int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
@@ -350,25 +322,6 @@ struct task_struct *__switch_to(struct task_struct *prev,
         unlazy_fpu(prev, task_pt_regs(prev));
 #endif
 
-#if defined(CONFIG_GUSA) && defined(CONFIG_PREEMPT)
-        {
-                struct pt_regs *regs;
-
-                preempt_disable();
-                regs = task_pt_regs(prev);
-                if (user_mode(regs) && regs->regs[15] >= 0xc0000000) {
-                        int offset = (int)regs->regs[15];
-
-                        /* Reset stack pointer: clear critical region mark */
-                        regs->regs[15] = regs->regs[1];
-                        if (regs->pc < regs->regs[0])
-                                /* Go to rewind point */
-                                regs->pc = regs->regs[0] + offset;
-                }
-                preempt_enable_no_resched();
-        }
-#endif
-
 #ifdef CONFIG_MMU
         /*
          * Restore the kernel mode register
@@ -510,49 +463,3 @@ asmlinkage void break_point_trap(void)
 
         force_sig(SIGTRAP, current);
 }
-
-/*
- * Generic trap handler.
- */
-asmlinkage void debug_trap_handler(unsigned long r4, unsigned long r5,
-                                   unsigned long r6, unsigned long r7,
-                                   struct pt_regs __regs)
-{
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
-
-        /* Rewind */
-        regs->pc -= instruction_size(ctrl_inw(regs->pc - 4));
-
-        if (notify_die(DIE_TRAP, "debug trap", regs, 0, regs->tra & 0xff,
-                       SIGTRAP) == NOTIFY_STOP)
-                return;
-
-        force_sig(SIGTRAP, current);
-}
-
-/*
- * Special handler for BUG() traps.
- */
-asmlinkage void bug_trap_handler(unsigned long r4, unsigned long r5,
-                                 unsigned long r6, unsigned long r7,
-                                 struct pt_regs __regs)
-{
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
-
-        /* Rewind */
-        regs->pc -= instruction_size(ctrl_inw(regs->pc - 4));
-
-        if (notify_die(DIE_TRAP, "bug trap", regs, 0, TRAPA_BUG_OPCODE & 0xff,
-                       SIGTRAP) == NOTIFY_STOP)
-                return;
-
-#ifdef CONFIG_BUG
-        if (__kernel_text_address(instruction_pointer(regs))) {
-                u16 insn = *(u16 *)instruction_pointer(regs);
-                if (insn == TRAPA_BUG_OPCODE)
-                        handle_BUG(regs);
-        }
-#endif
-
-        force_sig(SIGTRAP, current);
-}
diff --git a/arch/sh64/kernel/process.c b/arch/sh/kernel/process_64.c
index 0761af4d2a42..cff3b7dc9c56 100644
--- a/arch/sh64/kernel/process.c
+++ b/arch/sh/kernel/process_64.c
@@ -1,12 +1,10 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
+ * arch/sh/kernel/process_64.c
  *
- * arch/sh64/kernel/process.c
+ * This file handles the architecture-dependent parts of process handling..
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
+ * Copyright (C) 2003 - 2007  Paul Mundt
  * Copyright (C) 2003, 2004 Richard Curnow
  *
  * Started from SH3/4 version:
@@ -15,10 +13,9 @@
  *   In turn started from i386 version:
  *     Copyright (C) 1995  Linus Torvalds
  *
- */
-
-/*
- * This file handles the architecture-dependent parts of process handling..
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
 #include <linux/mm.h>
 #include <linux/fs.h>
@@ -27,8 +24,10 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
+#include <linux/io.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
+#include <asm/mmu_context.h>
 
 struct task_struct *last_task_used_math = NULL;
 
@@ -106,9 +105,20 @@ void machine_halt(void)
 
 void machine_power_off(void)
 {
-        extern void enter_deep_standby(void);
+#if 0
+        /* Disable watchdog timer */
+        ctrl_outl(0xa5000000, WTCSR);
+        /* Configure deep standby on sleep */
+        ctrl_outl(0x03, STBCR);
+#endif
+
+        __asm__ __volatile__ (
+                "sleep\n\t"
+                "synci\n\t"
+                "nop;nop;nop;nop\n\t"
+        );
 
-        enter_deep_standby();
+        panic("Unexpected wakeup!\n");
 }
 
 void (*pm_power_off)(void) = machine_power_off;
@@ -411,19 +421,22 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
  */
 void exit_thread(void)
 {
-        /* See arch/sparc/kernel/process.c for the precedent for doing this -- RPC.
-
-           The SH-5 FPU save/restore approach relies on last_task_used_math
-           pointing to a live task_struct.  When another task tries to use the
-           FPU for the 1st time, the FPUDIS trap handling (see
-           arch/sh64/kernel/fpu.c) will save the existing FPU state to the
-           FP regs field within last_task_used_math before re-loading the new
-           task's FPU state (or initialising it if the FPU has been used
-           before).  So if last_task_used_math is stale, and its page has already been
-           re-allocated for another use, the consequences are rather grim. Unless we
-           null it here, there is no other path through which it would get safely
-           nulled. */
-
+        /*
+         * See arch/sparc/kernel/process.c for the precedent for doing
+         * this -- RPC.
+         *
+         * The SH-5 FPU save/restore approach relies on
+         * last_task_used_math pointing to a live task_struct.  When
+         * another task tries to use the FPU for the 1st time, the FPUDIS
+         * trap handling (see arch/sh/kernel/cpu/sh5/fpu.c) will save the
+         * existing FPU state to the FP regs field within
+         * last_task_used_math before re-loading the new task's FPU state
+         * (or initialising it if the FPU has been used before).  So if
+         * last_task_used_math is stale, and its page has already been
+         * re-allocated for another use, the consequences are rather
+         * grim. Unless we null it here, there is no other path through
+         * which it would get safely nulled.
+         */
 #ifdef CONFIG_SH_FPU
         if (last_task_used_math == current) {
                 last_task_used_math = NULL;
@@ -469,9 +482,9 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
         fpvalid = !!tsk_used_math(tsk);
         if (fpvalid) {
                 if (current == last_task_used_math) {
-                        grab_fpu();
-                        fpsave(&tsk->thread.fpu.hard);
-                        release_fpu();
+                        enable_fpu();
+                        save_fpu(tsk, regs);
+                        disable_fpu();
                         last_task_used_math = 0;
                         regs->sr |= SR_FD;
                 }
@@ -496,9 +509,9 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
 
 #ifdef CONFIG_SH_FPU
         if(last_task_used_math == current) {
-                grab_fpu();
-                fpsave(&current->thread.fpu.hard);
-                release_fpu();
+                enable_fpu();
+                save_fpu(current, regs);
+                disable_fpu();
                 last_task_used_math = NULL;
                 regs->sr |= SR_FD;
         }
@@ -665,17 +678,14 @@ asids_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, void
         read_lock(&tasklist_lock);
         for_each_process(p) {
                 int pid = p->pid;
-                struct mm_struct *mm;
-                if (!pid) continue;
-                mm = p->mm;
-                if (mm) {
-                        unsigned long asid, context;
-                        context = mm->context;
-                        asid = (context & 0xff);
-                        len += sprintf(buf+len, "%5d : %02lx\n", pid, asid);
-                } else {
+
+                if (!pid)
+                        continue;
+                if (p->mm)
+                        len += sprintf(buf+len, "%5d : %02lx\n", pid,
+                                       asid_cache(smp_processor_id()));
+                else
                         len += sprintf(buf+len, "%5d : (none)\n", pid);
-                }
         }
         read_unlock(&tasklist_lock);
         *eof = 1;
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace_32.c
index ac725f0aeb72..ce0664a58b49 100644
--- a/arch/sh/kernel/ptrace.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -6,7 +6,7 @@
  *      edited by Linus Torvalds
  *
  * SuperH version:   Copyright (C) 1999, 2000  Kaz Kojima & Niibe Yutaka
- *
+ * Audit support: Yuichi Nakamura <ynakam@hitachisoft.jp>
  */
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -19,6 +19,7 @@
 #include <linux/security.h>
 #include <linux/signal.h>
 #include <linux/io.h>
+#include <linux/audit.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
@@ -248,15 +249,20 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         return ret;
 }
 
-asmlinkage void do_syscall_trace(void)
+asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
 {
         struct task_struct *tsk = current;
 
+        if (unlikely(current->audit_context) && entryexit)
+                audit_syscall_exit(AUDITSC_RESULT(regs->regs[0]),
+                                   regs->regs[0]);
+
         if (!test_thread_flag(TIF_SYSCALL_TRACE) &&
             !test_thread_flag(TIF_SINGLESTEP))
-                return;
+                goto out;
         if (!(tsk->ptrace & PT_PTRACED))
-                return;
+                goto out;
+
         /* the 0x80 provides a way for the tracing parent to distinguish
            between a syscall stop and SIGTRAP delivery */
         ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) &&
@@ -271,4 +277,11 @@ asmlinkage void do_syscall_trace(void)
                 send_sig(tsk->exit_code, tsk, 1);
                 tsk->exit_code = 0;
         }
+
+out:
+        if (unlikely(current->audit_context) && !entryexit)
+                audit_syscall_entry(AUDIT_ARCH_SH, regs->regs[3],
+                                    regs->regs[4], regs->regs[5],
+                                    regs->regs[6], regs->regs[7]);
+
 }
diff --git a/arch/sh64/kernel/ptrace.c b/arch/sh/kernel/ptrace_64.c
index 8a2d339cf760..f6fbdfa6876d 100644
--- a/arch/sh64/kernel/ptrace.c
+++ b/arch/sh/kernel/ptrace_64.c
@@ -1,12 +1,8 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/ptrace.c
+ * arch/sh/kernel/ptrace_64.c
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
+ * Copyright (C) 2003 - 2007  Paul Mundt
  *
  * Started from SH3/4 version:
  *   SuperH version:   Copyright (C) 1999, 2000  Kaz Kojima & Niibe Yutaka
@@ -15,8 +11,10 @@
  *      By Ross Biro 1/23/92
  *      edited by Linus Torvalds
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #include <linux/kernel.h>
 #include <linux/rwsem.h>
 #include <linux/sched.h>
@@ -28,7 +26,7 @@
 #include <linux/user.h>
 #include <linux/signal.h>
 #include <linux/syscalls.h>
-
+#include <linux/audit.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -74,9 +72,9 @@ get_fpu_long(struct task_struct *task, unsigned long addr)
         }
 
         if (last_task_used_math == task) {
-                grab_fpu();
-                fpsave(&task->thread.fpu.hard);
-                release_fpu();
+                enable_fpu();
+                save_fpu(task, regs);
+                disable_fpu();
                 last_task_used_math = 0;
                 regs->sr |= SR_FD;
         }
@@ -110,9 +108,9 @@ put_fpu_long(struct task_struct *task, unsigned long addr, unsigned long data)
                 fpinit(&task->thread.fpu.hard);
                 set_stopped_child_used_math(task);
         } else if (last_task_used_math == task) {
-                grab_fpu();
-                fpsave(&task->thread.fpu.hard);
-                release_fpu();
+                enable_fpu();
+                save_fpu(task, regs);
+                disable_fpu();
                 last_task_used_math = 0;
                 regs->sr |= SR_FD;
         }
@@ -253,7 +251,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
 asmlinkage int sh64_ptrace(long request, long pid, long addr, long data)
 {
-        extern void poke_real_address_q(unsigned long long addr, unsigned long long data);
 #define WPC_DBRMODE 0x0d104008
         static int first_call = 1;
 
@@ -275,17 +272,23 @@ asmlinkage int sh64_ptrace(long request, long pid, long addr, long data)
         return sys_ptrace(request, pid, addr, data);
 }
 
-asmlinkage void syscall_trace(void)
+asmlinkage void syscall_trace(struct pt_regs *regs, int entryexit)
 {
         struct task_struct *tsk = current;
 
-        if (!test_thread_flag(TIF_SYSCALL_TRACE))
-                return;
+        if (unlikely(current->audit_context) && entryexit)
+                audit_syscall_exit(AUDITSC_RESULT(regs->regs[9]),
+                                   regs->regs[9]);
+
+        if (!test_thread_flag(TIF_SYSCALL_TRACE) &&
+            !test_thread_flag(TIF_SINGLESTEP))
+                goto out;
         if (!(tsk->ptrace & PT_PTRACED))
-                return;
+                goto out;
+
+        ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) &&
+                                !test_thread_flag(TIF_SINGLESTEP) ? 0x80 : 0));
 
-        ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
-                                 ? 0x80 : 0));
         /*
          * this isn't the same as continuing with a signal, but it will do
          * for normal use.  strace only continues with a signal if the
@@ -295,6 +298,12 @@ asmlinkage void syscall_trace(void)
                 send_sig(tsk->exit_code, tsk, 1);
                 tsk->exit_code = 0;
         }
+
+out:
+        if (unlikely(current->audit_context) && !entryexit)
+                audit_syscall_entry(AUDIT_ARCH_SH, regs->regs[1],
+                                    regs->regs[2], regs->regs[3],
+                                    regs->regs[4], regs->regs[5]);
 }
 
 /* Called with interrupts disabled */
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 4156aac8c27d..855cdf9d85b1 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -26,6 +26,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/page.h>
+#include <asm/elf.h>
 #include <asm/sections.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
@@ -78,12 +79,25 @@ EXPORT_SYMBOL(memory_start);
 unsigned long memory_end = 0;
 EXPORT_SYMBOL(memory_end);
 
+int l1i_cache_shape, l1d_cache_shape, l2_cache_shape;
+
 static int __init early_parse_mem(char *p)
 {
         unsigned long size;
 
-        memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START;
+        memory_start = (unsigned long)__va(__MEMORY_START);
         size = memparse(p, &p);
+
+        if (size > __MEMORY_SIZE) {
+                static char msg[] __initdata = KERN_ERR
+                        "Using mem= to increase the size of kernel memory "
+                        "is not allowed.\n"
+                        "  Recompile the kernel with the correct value for "
+                        "CONFIG_MEMORY_SIZE.\n";
+                printk(msg);
+                return 0;
+        }
+
         memory_end = memory_start + size;
 
         return 0;
@@ -243,7 +257,7 @@ void __init setup_arch(char **cmdline_p)
         data_resource.start = virt_to_phys(_etext);
         data_resource.end = virt_to_phys(_edata)-1;
 
-        memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START;
+        memory_start = (unsigned long)__va(__MEMORY_START);
         if (!memory_end)
                 memory_end = memory_start + __MEMORY_SIZE;
 
@@ -294,20 +308,23 @@ void __init setup_arch(char **cmdline_p)
 }
 
 static const char *cpu_name[] = {
+        [CPU_SH7203]    = "SH7203",     [CPU_SH7263]    = "SH7263",
         [CPU_SH7206]    = "SH7206",     [CPU_SH7619]    = "SH7619",
         [CPU_SH7705]    = "SH7705",     [CPU_SH7706]    = "SH7706",
         [CPU_SH7707]    = "SH7707",     [CPU_SH7708]    = "SH7708",
         [CPU_SH7709]    = "SH7709",     [CPU_SH7710]    = "SH7710",
         [CPU_SH7712]    = "SH7712",     [CPU_SH7720]    = "SH7720",
-        [CPU_SH7729]    = "SH7729",     [CPU_SH7750]    = "SH7750",
-        [CPU_SH7750S]   = "SH7750S",    [CPU_SH7750R]   = "SH7750R",
-        [CPU_SH7751]    = "SH7751",     [CPU_SH7751R]   = "SH7751R",
-        [CPU_SH7760]    = "SH7760",
+        [CPU_SH7721]    = "SH7721",     [CPU_SH7729]    = "SH7729",
+        [CPU_SH7750]    = "SH7750",     [CPU_SH7750S]   = "SH7750S",
+        [CPU_SH7750R]   = "SH7750R",    [CPU_SH7751]    = "SH7751",
+        [CPU_SH7751R]   = "SH7751R",    [CPU_SH7760]    = "SH7760",
         [CPU_SH4_202]   = "SH4-202",    [CPU_SH4_501]   = "SH4-501",
-        [CPU_SH7770]    = "SH7770",     [CPU_SH7780]    = "SH7780",
-        [CPU_SH7781]    = "SH7781",     [CPU_SH7343]    = "SH7343",
-        [CPU_SH7785]    = "SH7785",     [CPU_SH7722]    = "SH7722",
-        [CPU_SHX3]      = "SH-X3",      [CPU_SH_NONE]   = "Unknown"
+        [CPU_SH7763]    = "SH7763",     [CPU_SH7770]    = "SH7770",
+        [CPU_SH7780]    = "SH7780",     [CPU_SH7781]    = "SH7781",
+        [CPU_SH7343]    = "SH7343",     [CPU_SH7785]    = "SH7785",
+        [CPU_SH7722]    = "SH7722",     [CPU_SHX3]      = "SH-X3",
+        [CPU_SH5_101]   = "SH5-101",    [CPU_SH5_103]   = "SH5-103",
+        [CPU_SH_NONE]   = "Unknown"
 };
 
 const char *get_cpu_subtype(struct sh_cpuinfo *c)
@@ -410,7 +427,7 @@ static void *c_next(struct seq_file *m, void *v, loff_t *pos)
 static void c_stop(struct seq_file *m, void *v)
 {
 }
-struct seq_operations cpuinfo_op = {
+const struct seq_operations cpuinfo_op = {
         .start  = c_start,
         .next   = c_next,
         .stop   = c_stop,
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms_32.c
index e1a6de9088b5..e1a6de9088b5 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms_32.c
diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms_64.c
index b1705acc8e64..8004c38d3d37 100644
--- a/arch/sh64/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms_64.c
@@ -1,14 +1,12 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/sh_ksyms.c
+ * arch/sh/kernel/sh_ksyms_64.c
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #include <linux/rwsem.h>
 #include <linux/module.h>
 #include <linux/smp.h>
@@ -18,7 +16,6 @@
 #include <linux/in6.h>
 #include <linux/interrupt.h>
 #include <linux/screen_info.h>
-
 #include <asm/semaphore.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
@@ -47,12 +44,8 @@ EXPORT_SYMBOL(__put_user_asm_l);
 EXPORT_SYMBOL(__get_user_asm_l);
 EXPORT_SYMBOL(__copy_user);
 EXPORT_SYMBOL(memcpy);
-EXPORT_SYMBOL(udelay);
 EXPORT_SYMBOL(__udelay);
-EXPORT_SYMBOL(ndelay);
 EXPORT_SYMBOL(__ndelay);
-EXPORT_SYMBOL(flush_dcache_page);
-EXPORT_SYMBOL(sh64_page_clear);
 
 /* Ugh.  These come in from libgcc.a at link time. */
 #define DECLARE_EXPORT(name) extern void name(void);EXPORT_SYMBOL(name)
diff --git a/arch/sh/kernel/signal.c b/arch/sh/kernel/signal_32.c
index ca754fd42437..f6b5fbfe75c4 100644
--- a/arch/sh/kernel/signal.c
+++ b/arch/sh/kernel/signal_32.c
@@ -507,24 +507,6 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
                                                 ctrl_inw(regs->pc - 4));
                                 break;
                 }
-#ifdef CONFIG_GUSA
-        } else {
-                /* gUSA handling */
-                preempt_disable();
-
-                if (regs->regs[15] >= 0xc0000000) {
-                        int offset = (int)regs->regs[15];
-
-                        /* Reset stack pointer: clear critical region mark */
-                        regs->regs[15] = regs->regs[1];
-                        if (regs->pc < regs->regs[0])
-                                /* Go to rewind point #1 */
-                                regs->pc = regs->regs[0] + offset -
-                                        instruction_size(ctrl_inw(regs->pc-4));
-                }
-
-                preempt_enable_no_resched();
-#endif
         }
 
         /* Set up the stack frame */
diff --git a/arch/sh64/kernel/signal.c b/arch/sh/kernel/signal_64.c
index 79fc48cf54c6..80bde19d445b 100644
--- a/arch/sh64/kernel/signal.c
+++ b/arch/sh/kernel/signal_64.c
@@ -1,16 +1,13 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/signal.c
+ * arch/sh/kernel/signal_64.c
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003  Paul Mundt
  * Copyright (C) 2004  Richard Curnow
  *
- * Started from sh version.
- *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
 #include <linux/rwsem.h>
 #include <linux/sched.h>
@@ -28,7 +25,7 @@
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
-
+#include <asm/cacheflush.h>
 
 #define REG_RET 9
 #define REG_ARG1 2
@@ -211,9 +208,9 @@ setup_sigcontext_fpu(struct pt_regs *regs, struct sigcontext __user *sc)
                 return err;
 
         if (current == last_task_used_math) {
-                grab_fpu();
-                fpsave(&current->thread.fpu.hard);
-                release_fpu();
+                enable_fpu();
+                save_fpu(current, regs);
+                disable_fpu();
                 last_task_used_math = NULL;
                 regs->sr |= SR_FD;
         }
@@ -227,10 +224,14 @@ setup_sigcontext_fpu(struct pt_regs *regs, struct sigcontext __user *sc)
 #else
 static inline int
 restore_sigcontext_fpu(struct pt_regs *regs, struct sigcontext __user *sc)
-{}
+{
+        return 0;
+}
 static inline int
 setup_sigcontext_fpu(struct pt_regs *regs, struct sigcontext __user *sc)
-{}
+{
+        return 0;
+}
 #endif
 
 static int
@@ -477,7 +478,7 @@ static void setup_frame(int sig, struct k_sigaction *ka,
                         goto give_sigsegv;
 
                 /* Cohere the trampoline with the I-cache. */
-                flush_cache_sigtramp(DEREF_REG_PR-1, DEREF_REG_PR-1+16);
+                flush_cache_sigtramp(DEREF_REG_PR-1);
         }
 
         /*
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c
index d545a686a201..59cd2859ce9b 100644
--- a/arch/sh/kernel/sys_sh.c
+++ b/arch/sh/kernel/sys_sh.c
@@ -7,7 +7,6 @@
  *
  * Taken from i386 version.
  */
-
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -27,28 +26,7 @@
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way Unix traditionally does this, though.
- */
-asmlinkage int sys_pipe(unsigned long r4, unsigned long r5,
-        unsigned long r6, unsigned long r7,
-        struct pt_regs __regs)
-{
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                regs->regs[1] = fd[1];
-                return fd[0];
-        }
-        return error;
-}
-
 unsigned long shm_align_mask = PAGE_SIZE - 1;   /* Sane caches */
-
 EXPORT_SYMBOL(shm_align_mask);
 
 #ifdef CONFIG_MMU
@@ -140,7 +118,7 @@ full_search:
 #endif /* CONFIG_MMU */
 
 static inline long
-do_mmap2(unsigned long addr, unsigned long len, unsigned long prot, 
+do_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
          unsigned long flags, int fd, unsigned long pgoff)
 {
         int error = -EBADF;
@@ -195,12 +173,13 @@ asmlinkage int sys_ipc(uint call, int first, int second,
         if (call <= SEMCTL)
                 switch (call) {
                 case SEMOP:
-                        return sys_semtimedop(first, (struct sembuf __user *)ptr,
+                        return sys_semtimedop(first,
+                                              (struct sembuf __user *)ptr,
                                               second, NULL);
                 case SEMTIMEDOP:
-                        return sys_semtimedop(first, (struct sembuf __user *)ptr,
-                                              second,
-                                              (const struct timespec __user *)fifth);
+                        return sys_semtimedop(first,
+                                (struct sembuf __user *)ptr, second,
+                                (const struct timespec __user *)fifth);
                 case SEMGET:
                         return sys_semget (first, second, third);
                 case SEMCTL: {
@@ -215,25 +194,28 @@ asmlinkage int sys_ipc(uint call, int first, int second,
                         return -EINVAL;
                 }
 
-        if (call <= MSGCTL) 
+        if (call <= MSGCTL)
                 switch (call) {
                 case MSGSND:
-                        return sys_msgsnd (first, (struct msgbuf __user *) ptr, 
+                        return sys_msgsnd (first, (struct msgbuf __user *) ptr,
                                           second, third);
                 case MSGRCV:
                         switch (version) {
-                        case 0: {
+                        case 0:
+                        {
                                 struct ipc_kludge tmp;
+
                                 if (!ptr)
                                         return -EINVAL;
-                                
+
                                 if (copy_from_user(&tmp,
-                                                   (struct ipc_kludge __user *) ptr, 
+                                        (struct ipc_kludge __user *) ptr,
                                                    sizeof (tmp)))
                                         return -EFAULT;
+
                                 return sys_msgrcv (first, tmp.msgp, second,
                                                    tmp.msgtyp, third);
-                                }
+                        }
                         default:
                                 return sys_msgrcv (first,
                                                    (struct msgbuf __user *) ptr,
@@ -247,7 +229,7 @@ asmlinkage int sys_ipc(uint call, int first, int second,
                 default:
                         return -EINVAL;
                 }
-        if (call <= SHMCTL) 
+        if (call <= SHMCTL)
                 switch (call) {
                 case SHMAT:
                         switch (version) {
@@ -265,7 +247,7 @@ asmlinkage int sys_ipc(uint call, int first, int second,
                                 return do_shmat (first, (char __user *) ptr,
                                                   second, (ulong *) third);
                         }
-                case SHMDT: 
+                case SHMDT:
                         return sys_shmdt ((char __user *)ptr);
                 case SHMGET:
                         return sys_shmget (first, second, third);
@@ -275,7 +257,7 @@ asmlinkage int sys_ipc(uint call, int first, int second,
                 default:
                         return -EINVAL;
                 }
-        
+
         return -EINVAL;
 }
 
@@ -289,49 +271,3 @@ asmlinkage int sys_uname(struct old_utsname * name)
         up_read(&uts_sem);
         return err?-EFAULT:0;
 }
-
-asmlinkage ssize_t sys_pread_wrapper(unsigned int fd, char * buf,
-                             size_t count, long dummy, loff_t pos)
-{
-        return sys_pread64(fd, buf, count, pos);
-}
-
-asmlinkage ssize_t sys_pwrite_wrapper(unsigned int fd, const char * buf,
-                              size_t count, long dummy, loff_t pos)
-{
-        return sys_pwrite64(fd, buf, count, pos);
-}
-
-asmlinkage int sys_fadvise64_64_wrapper(int fd, u32 offset0, u32 offset1,
-                                u32 len0, u32 len1, int advice)
-{
-#ifdef  __LITTLE_ENDIAN__
-        return sys_fadvise64_64(fd, (u64)offset1 << 32 | offset0,
-                                (u64)len1 << 32 | len0, advice);
-#else
-        return sys_fadvise64_64(fd, (u64)offset0 << 32 | offset1,
-                                (u64)len0 << 32 | len1, advice);
-#endif
-}
-
-#if defined(CONFIG_CPU_SH2) || defined(CONFIG_CPU_SH2A)
-#define SYSCALL_ARG3    "trapa #0x23"
-#else
-#define SYSCALL_ARG3    "trapa #0x13"
-#endif
-
-/*
- * Do a system call from kernel instead of calling sys_execve so we
- * end up with proper pt_regs.
- */
-int kernel_execve(const char *filename, char *const argv[], char *const envp[])
-{
-        register long __sc0 __asm__ ("r3") = __NR_execve;
-        register long __sc4 __asm__ ("r4") = (long) filename;
-        register long __sc5 __asm__ ("r5") = (long) argv;
-        register long __sc6 __asm__ ("r6") = (long) envp;
-        __asm__ __volatile__ (SYSCALL_ARG3 : "=z" (__sc0)       
-                        : "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6)
-                        : "memory");
-        return __sc0;
-}
diff --git a/arch/sh/kernel/sys_sh32.c b/arch/sh/kernel/sys_sh32.c
new file mode 100644
index 000000000000..125e493ead82
--- /dev/null
+++ b/arch/sh/kernel/sys_sh32.c
@@ -0,0 +1,84 @@
+#include <linux/errno.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <linux/smp.h>
+#include <linux/sem.h>
+#include <linux/msg.h>
+#include <linux/shm.h>
+#include <linux/stat.h>
+#include <linux/syscalls.h>
+#include <linux/mman.h>
+#include <linux/file.h>
+#include <linux/utsname.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/ipc.h>
+#include <asm/cacheflush.h>
+#include <asm/uaccess.h>
+#include <asm/unistd.h>
+
+/*
+ * sys_pipe() is the normal C calling standard for creating
+ * a pipe. It's not the way Unix traditionally does this, though.
+ */
+asmlinkage int sys_pipe(unsigned long r4, unsigned long r5,
+        unsigned long r6, unsigned long r7,
+        struct pt_regs __regs)
+{
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        int fd[2];
+        int error;
+
+        error = do_pipe(fd);
+        if (!error) {
+                regs->regs[1] = fd[1];
+                return fd[0];
+        }
+        return error;
+}
+
+asmlinkage ssize_t sys_pread_wrapper(unsigned int fd, char * buf,
+                             size_t count, long dummy, loff_t pos)
+{
+        return sys_pread64(fd, buf, count, pos);
+}
+
+asmlinkage ssize_t sys_pwrite_wrapper(unsigned int fd, const char * buf,
+                              size_t count, long dummy, loff_t pos)
+{
+        return sys_pwrite64(fd, buf, count, pos);
+}
+
+asmlinkage int sys_fadvise64_64_wrapper(int fd, u32 offset0, u32 offset1,
+                                u32 len0, u32 len1, int advice)
+{
+#ifdef  __LITTLE_ENDIAN__
+        return sys_fadvise64_64(fd, (u64)offset1 << 32 | offset0,
+                                (u64)len1 << 32 | len0, advice);
+#else
+        return sys_fadvise64_64(fd, (u64)offset0 << 32 | offset1,
+                                (u64)len0 << 32 | len1, advice);
+#endif
+}
+
+#if defined(CONFIG_CPU_SH2) || defined(CONFIG_CPU_SH2A)
+#define SYSCALL_ARG3    "trapa #0x23"
+#else
+#define SYSCALL_ARG3    "trapa #0x13"
+#endif
+
+/*
+ * Do a system call from kernel instead of calling sys_execve so we
+ * end up with proper pt_regs.
+ */
+int kernel_execve(const char *filename, char *const argv[], char *const envp[])
+{
+        register long __sc0 __asm__ ("r3") = __NR_execve;
+        register long __sc4 __asm__ ("r4") = (long) filename;
+        register long __sc5 __asm__ ("r5") = (long) argv;
+        register long __sc6 __asm__ ("r6") = (long) envp;
+        __asm__ __volatile__ (SYSCALL_ARG3 : "=z" (__sc0)
+                        : "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6)
+                        : "memory");
+        return __sc0;
+}
diff --git a/arch/sh/kernel/sys_sh64.c b/arch/sh/kernel/sys_sh64.c
new file mode 100644
index 000000000000..578004d71e02
--- /dev/null
+++ b/arch/sh/kernel/sys_sh64.c
@@ -0,0 +1,66 @@
+/*
+ * arch/sh/kernel/sys_sh64.c
+ *
+ * Copyright (C) 2000, 2001  Paolo Alberelli
+ *
+ * This file contains various random system calls that
+ * have a non-standard calling sequence on the Linux/SH5
+ * platform.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/errno.h>
+#include <linux/rwsem.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <linux/fs.h>
+#include <linux/smp.h>
+#include <linux/sem.h>
+#include <linux/msg.h>
+#include <linux/shm.h>
+#include <linux/stat.h>
+#include <linux/mman.h>
+#include <linux/file.h>
+#include <linux/utsname.h>
+#include <linux/syscalls.h>
+#include <linux/ipc.h>
+#include <asm/uaccess.h>
+#include <asm/ptrace.h>
+#include <asm/unistd.h>
+
+/*
+ * sys_pipe() is the normal C calling standard for creating
+ * a pipe. It's not the way Unix traditionally does this, though.
+ */
+asmlinkage int sys_pipe(unsigned long * fildes)
+{
+        int fd[2];
+        int error;
+
+        error = do_pipe(fd);
+        if (!error) {
+                if (copy_to_user(fildes, fd, 2*sizeof(int)))
+                        error = -EFAULT;
+        }
+        return error;
+}
+
+/*
+ * Do a system call from kernel instead of calling sys_execve so we
+ * end up with proper pt_regs.
+ */
+int kernel_execve(const char *filename, char *const argv[], char *const envp[])
+{
+        register unsigned long __sc0 __asm__ ("r9") = ((0x13 << 16) | __NR_execve);
+        register unsigned long __sc2 __asm__ ("r2") = (unsigned long) filename;
+        register unsigned long __sc3 __asm__ ("r3") = (unsigned long) argv;
+        register unsigned long __sc4 __asm__ ("r4") = (unsigned long) envp;
+        __asm__ __volatile__ ("trapa    %1 !\t\t\t execve(%2,%3,%4)"
+        : "=r" (__sc0)
+        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4) );
+        __asm__ __volatile__ ("!dummy   %0 %1 %2 %3"
+        : : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4) : "memory");
+        return __sc0;
+}
diff --git a/arch/sh/kernel/syscalls.S b/arch/sh/kernel/syscalls_32.S
index 10bec45415ba..10bec45415ba 100644
--- a/arch/sh/kernel/syscalls.S
+++ b/arch/sh/kernel/syscalls_32.S
diff --git a/arch/sh64/kernel/syscalls.S b/arch/sh/kernel/syscalls_64.S
index abb94c05d07a..98a93efe3691 100644
--- a/arch/sh64/kernel/syscalls.S
+++ b/arch/sh/kernel/syscalls_64.S
@@ -1,5 +1,5 @@
 /*
- * arch/sh64/kernel/syscalls.S
+ * arch/sh/kernel/syscalls_64.S
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2004 - 2007  Paul Mundt
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time_32.c
index 2bc04bfee738..2bc04bfee738 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time_32.c
diff --git a/arch/sh64/kernel/time.c b/arch/sh/kernel/time_64.c
index 06f3c179e345..f819ba38a6ce 100644
--- a/arch/sh64/kernel/time.c
+++ b/arch/sh/kernel/time_64.c
@@ -1,20 +1,19 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/time.c
+ * arch/sh/kernel/time_64.c
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
+ * Copyright (C) 2003 - 2007  Paul Mundt
  * Copyright (C) 2003  Richard Curnow
  *
  *    Original TMU/RTC code taken from sh version.
  *    Copyright (C) 1999  Tetsuya Okada & Niibe Yutaka
  *      Some code taken from i386 version.
  *      Copyright (C) 1991, 1992, 1995  Linus Torvalds
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #include <linux/errno.h>
 #include <linux/rwsem.h>
 #include <linux/sched.h>
@@ -30,37 +29,27 @@
 #include <linux/smp.h>
 #include <linux/module.h>
 #include <linux/bcd.h>
-
-#include <asm/registers.h>       /* required by inline __asm__ stmt. */
-
+#include <linux/timex.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <asm/cpu/registers.h>   /* required by inline __asm__ stmt. */
+#include <asm/cpu/irq.h>
+#include <asm/addrspace.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/delay.h>
 
-#include <linux/timex.h>
-#include <linux/irq.h>
-#include <asm/hardware.h>
-
 #define TMU_TOCR_INIT   0x00
 #define TMU0_TCR_INIT   0x0020
 #define TMU_TSTR_INIT   1
 #define TMU_TSTR_OFF    0
 
-/* RCR1 Bits */
-#define RCR1_CF         0x80    /* Carry Flag             */
-#define RCR1_CIE        0x10    /* Carry Interrupt Enable */
-#define RCR1_AIE        0x08    /* Alarm Interrupt Enable */
-#define RCR1_AF         0x01    /* Alarm Flag             */
-
-/* RCR2 Bits */
-#define RCR2_PEF        0x80    /* PEriodic interrupt Flag */
-#define RCR2_PESMASK    0x70    /* Periodic interrupt Set  */
-#define RCR2_RTCEN      0x08    /* ENable RTC              */
-#define RCR2_ADJ        0x04    /* ADJustment (30-second)  */
-#define RCR2_RESET      0x02    /* Reset bit               */
-#define RCR2_START      0x01    /* Start bit               */
+/* Real Time Clock */
+#define RTC_BLOCK_OFF   0x01040000
+#define RTC_BASE        PHYS_PERIPHERAL_BLOCK + RTC_BLOCK_OFF
+#define RTC_RCR1_CIE    0x10    /* Carry Interrupt Enable */
+#define RTC_RCR1        (rtc_base + 0x38)
 
 /* Clock, Power and Reset Controller */
 #define CPRC_BLOCK_OFF  0x01010000
@@ -84,27 +73,6 @@
 #define TMU0_TCNT       TMU0_BASE+0x4   /* Long access */
 #define TMU0_TCR        TMU0_BASE+0x8   /* Word access */
 
-/* Real Time Clock */
-#define RTC_BLOCK_OFF   0x01040000
-#define RTC_BASE        PHYS_PERIPHERAL_BLOCK + RTC_BLOCK_OFF
-
-#define R64CNT          rtc_base+0x00
-#define RSECCNT         rtc_base+0x04
-#define RMINCNT         rtc_base+0x08
-#define RHRCNT          rtc_base+0x0c
-#define RWKCNT          rtc_base+0x10
-#define RDAYCNT         rtc_base+0x14
-#define RMONCNT         rtc_base+0x18
-#define RYRCNT          rtc_base+0x1c   /* 16bit */
-#define RSECAR          rtc_base+0x20
-#define RMINAR          rtc_base+0x24
-#define RHRAR           rtc_base+0x28
-#define RWKAR           rtc_base+0x2c
-#define RDAYAR          rtc_base+0x30
-#define RMONAR          rtc_base+0x34
-#define RCR1            rtc_base+0x38
-#define RCR2            rtc_base+0x3c
-
 #define TICK_SIZE (tick_nsec / 1000)
 
 static unsigned long tmu_base, rtc_base;
@@ -236,47 +204,23 @@ int do_settimeofday(struct timespec *tv)
 }
 EXPORT_SYMBOL(do_settimeofday);
 
-static int set_rtc_time(unsigned long nowtime)
+/* Dummy RTC ops */
+static void null_rtc_get_time(struct timespec *tv)
 {
-        int retval = 0;
-        int real_seconds, real_minutes, cmos_minutes;
-
-        ctrl_outb(RCR2_RESET, RCR2);  /* Reset pre-scaler & stop RTC */
-
-        cmos_minutes = ctrl_inb(RMINCNT);
-        BCD_TO_BIN(cmos_minutes);
-
-        /*
-         * since we're only adjusting minutes and seconds,
-         * don't interfere with hour overflow. This avoids
-         * messing with unknown time zones but requires your
-         * RTC not to be off by more than 15 minutes
-         */
-        real_seconds = nowtime % 60;
-        real_minutes = nowtime / 60;
-        if (((abs(real_minutes - cmos_minutes) + 15)/30) & 1)
-                real_minutes += 30;     /* correct for half hour time zone */
-        real_minutes %= 60;
-
-        if (abs(real_minutes - cmos_minutes) < 30) {
-                BIN_TO_BCD(real_seconds);
-                BIN_TO_BCD(real_minutes);
-                ctrl_outb(real_seconds, RSECCNT);
-                ctrl_outb(real_minutes, RMINCNT);
-        } else {
-                printk(KERN_WARNING
-                       "set_rtc_time: can't update from %d to %d\n",
-                       cmos_minutes, real_minutes);
-                retval = -1;
-        }
-
-        ctrl_outb(RCR2_RTCEN|RCR2_START, RCR2);  /* Start RTC */
+        tv->tv_sec = mktime(2000, 1, 1, 0, 0, 0);
+        tv->tv_nsec = 0;
+}
 
-        return retval;
+static int null_rtc_set_time(const time_t secs)
+{
+        return 0;
 }
 
+void (*rtc_sh_get_time)(struct timespec *) = null_rtc_get_time;
+int (*rtc_sh_set_time)(const time_t) = null_rtc_set_time;
+
 /* last time the RTC clock got updated */
-static long last_rtc_update = 0;
+static long last_rtc_update;
 
 /*
  * timer_interrupt() needs to keep up the real-time clock,
@@ -296,11 +240,8 @@ static inline void do_timer_interrupt(void)
                 profile_tick(CPU_PROFILING);
 
 #ifdef CONFIG_HEARTBEAT
-        {
-                extern void heartbeat(void);
-
-                heartbeat();
-        }
+        if (sh_mv.mv_heartbeat != NULL)
+                sh_mv.mv_heartbeat();
 #endif
 
         /*
@@ -312,10 +253,11 @@ static inline void do_timer_interrupt(void)
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
-                if (set_rtc_time(xtime.tv_sec) == 0)
+                if (rtc_sh_set_time(xtime.tv_sec) == 0)
                         last_rtc_update = xtime.tv_sec;
                 else
-                        last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */
+                        /* do it again in 60 s */
+                        last_rtc_update = xtime.tv_sec - 600;
         }
 }
 
@@ -347,50 +289,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static unsigned long get_rtc_time(void)
-{
-        unsigned int sec, min, hr, wk, day, mon, yr, yr100;
-
- again:
-        do {
-                ctrl_outb(0, RCR1);  /* Clear CF-bit */
-                sec = ctrl_inb(RSECCNT);
-                min = ctrl_inb(RMINCNT);
-                hr  = ctrl_inb(RHRCNT);
-                wk  = ctrl_inb(RWKCNT);
-                day = ctrl_inb(RDAYCNT);
-                mon = ctrl_inb(RMONCNT);
-                yr  = ctrl_inw(RYRCNT);
-                yr100 = (yr >> 8);
-                yr &= 0xff;
-        } while ((ctrl_inb(RCR1) & RCR1_CF) != 0);
-
-        BCD_TO_BIN(yr100);
-        BCD_TO_BIN(yr);
-        BCD_TO_BIN(mon);
-        BCD_TO_BIN(day);
-        BCD_TO_BIN(hr);
-        BCD_TO_BIN(min);
-        BCD_TO_BIN(sec);
-
-        if (yr > 99 || mon < 1 || mon > 12 || day > 31 || day < 1 ||
-            hr > 23 || min > 59 || sec > 59) {
-                printk(KERN_ERR
-                       "SH RTC: invalid value, resetting to 1 Jan 2000\n");
-                ctrl_outb(RCR2_RESET, RCR2);  /* Reset & Stop */
-                ctrl_outb(0, RSECCNT);
-                ctrl_outb(0, RMINCNT);
-                ctrl_outb(0, RHRCNT);
-                ctrl_outb(6, RWKCNT);
-                ctrl_outb(1, RDAYCNT);
-                ctrl_outb(1, RMONCNT);
-                ctrl_outw(0x2000, RYRCNT);
-                ctrl_outb(RCR2_RTCEN|RCR2_START, RCR2);  /* Start */
-                goto again;
-        }
-
-        return mktime(yr100 * 100 + yr, mon, day, hr, min, sec);
-}
 
 static __init unsigned int get_cpu_hz(void)
 {
@@ -406,8 +304,8 @@ static __init unsigned int get_cpu_hz(void)
         register unsigned long long  __rtc_irq_flag __asm__ ("r3");
 
         local_irq_enable();
-        do {} while (ctrl_inb(R64CNT) != 0);
-        ctrl_outb(RCR1_CIE, RCR1); /* Enable carry interrupt */
+        do {} while (ctrl_inb(rtc_base) != 0);
+        ctrl_outb(RTC_RCR1_CIE, RTC_RCR1); /* Enable carry interrupt */
 
         /*
          * r3 is arbitrary. CDC does not support "=z".
@@ -449,28 +347,19 @@ static __init unsigned int get_cpu_hz(void)
 
         count = ctc_val_init - ctc_val; /* CTC counts down */
 
-#if defined (CONFIG_SH_SIMULATOR)
-        /*
-         * Let's pretend we are a 5MHz SH-5 to avoid a too
-         * little timer interval. Also to keep delay
-         * calibration within a reasonable time.
-         */
-        return 5000000;
-#else
         /*
          * This really is count by the number of clock cycles
          * by the ratio between a complete R64CNT
          * wrap-around (128) and CUI interrupt being raised (64).
          */
         return count*2;
-#endif
 }
 
 static irqreturn_t sh64_rtc_interrupt(int irq, void *dev_id)
 {
         struct pt_regs *regs = get_irq_regs();
 
-        ctrl_outb(0, RCR1);     /* Disable Carry Interrupts */
+        ctrl_outb(0, RTC_RCR1); /* Disable Carry Interrupts */
         regs->regs[3] = 1;      /* Using r3 */
 
         return IRQ_HANDLED;
@@ -513,8 +402,7 @@ void __init time_init(void)
                 panic("Unable to remap CPRC\n");
         }
 
-        xtime.tv_sec = get_rtc_time();
-        xtime.tv_nsec = 0;
+        rtc_sh_get_time(&xtime);
 
         setup_irq(TIMER_IRQ, &irq0);
         setup_irq(RTC_IRQ, &irq1);
@@ -525,7 +413,7 @@ void __init time_init(void)
         /* Note careful order of operations to maintain reasonable precision and avoid overflow. */
         scaled_recip_ctc_ticks_per_jiffy = ((1ULL << CTC_JIFFY_SCALE_SHIFT) / (unsigned long long)(cpu_clock / HZ));
 
-        disable_irq(RTC_IRQ);
+        free_irq(RTC_IRQ, NULL);
 
         printk("CPU clock: %d.%02dMHz\n",
                (cpu_clock / 1000000), (cpu_clock % 1000000)/10000);
@@ -591,3 +479,41 @@ void enter_deep_standby(void)
         asm __volatile__ ("nop");
         panic("Unexpected wakeup!\n");
 }
+
+static struct resource rtc_resources[] = {
+        [0] = {
+                /* RTC base, filled in by rtc_init */
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                /* Period IRQ */
+                .start  = IRQ_PRI,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                /* Carry IRQ */
+                .start  = IRQ_CUI,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                /* Alarm IRQ */
+                .start  = IRQ_ATI,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device rtc_device = {
+        .name           = "sh-rtc",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(rtc_resources),
+        .resource       = rtc_resources,
+};
+
+static int __init rtc_init(void)
+{
+        rtc_resources[0].start  = rtc_base;
+        rtc_resources[0].end    = rtc_resources[0].start + 0x58 - 1;
+
+        return platform_device_register(&rtc_device);
+}
+device_initcall(rtc_init);
diff --git a/arch/sh/kernel/timers/timer-cmt.c b/arch/sh/kernel/timers/timer-cmt.c
index 82de6895ade5..499e07beebe2 100644
--- a/arch/sh/kernel/timers/timer-cmt.c
+++ b/arch/sh/kernel/timers/timer-cmt.c
@@ -31,7 +31,9 @@
 #define cmt_clock_enable() do { ctrl_outb(ctrl_inb(STBCR3) & ~0x10, STBCR3); } while(0)
 #define CMT_CMCSR_INIT  0x0040
 #define CMT_CMCSR_CALIB 0x0000
-#elif defined(CONFIG_CPU_SUBTYPE_SH7206)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7203) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7206) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7263)
 #define CMT_CMSTR       0xfffec000
 #define CMT_CMCSR_0     0xfffec002
 #define CMT_CMCNT_0     0xfffec004
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index 628ec9a15e38..8935570008d2 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -174,6 +174,7 @@ static int tmu_timer_init(void)
         tmu_timer_stop();
 
 #if !defined(CONFIG_CPU_SUBTYPE_SH7720) && \
+    !defined(CONFIG_CPU_SUBTYPE_SH7721) && \
     !defined(CONFIG_CPU_SUBTYPE_SH7760) && \
     !defined(CONFIG_CPU_SUBTYPE_SH7785) && \
     !defined(CONFIG_CPU_SUBTYPE_SHX3)
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index cf99111cb33f..a3bdc68ef02c 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -1,947 +1,68 @@
-/*
- * 'traps.c' handles hardware traps and faults after we have saved some
- * state in 'entry.S'.
- *
- *  SuperH version: Copyright (C) 1999 Niibe Yutaka
- *                  Copyright (C) 2000 Philipp Rumpf
- *                  Copyright (C) 2000 David Howells
- *                  Copyright (C) 2002 - 2007 Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/kernel.h>
-#include <linux/ptrace.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/module.h>
-#include <linux/kallsyms.h>
-#include <linux/io.h>
 #include <linux/bug.h>
-#include <linux/debug_locks.h>
+#include <linux/io.h>
+#include <linux/types.h>
 #include <linux/kdebug.h>
-#include <linux/kexec.h>
-#include <linux/limits.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
-
-#ifdef CONFIG_SH_KGDB
-#include <asm/kgdb.h>
-#define CHK_REMOTE_DEBUG(regs)                  \
-{                                               \
-        if (kgdb_debug_hook && !user_mode(regs))\
-                (*kgdb_debug_hook)(regs);       \
-}
-#else
-#define CHK_REMOTE_DEBUG(regs)
-#endif
-
-#ifdef CONFIG_CPU_SH2
-# define TRAP_RESERVED_INST     4
-# define TRAP_ILLEGAL_SLOT_INST 6
-# define TRAP_ADDRESS_ERROR     9
-# ifdef CONFIG_CPU_SH2A
-#  define TRAP_DIVZERO_ERROR    17
-#  define TRAP_DIVOVF_ERROR     18
-# endif
-#else
-#define TRAP_RESERVED_INST      12
-#define TRAP_ILLEGAL_SLOT_INST  13
-#endif
-
-static void dump_mem(const char *str, unsigned long bottom, unsigned long top)
-{
-        unsigned long p;
-        int i;
-
-        printk("%s(0x%08lx to 0x%08lx)\n", str, bottom, top);
-
-        for (p = bottom & ~31; p < top; ) {
-                printk("%04lx: ", p & 0xffff);
-
-                for (i = 0; i < 8; i++, p += 4) {
-                        unsigned int val;
-
-                        if (p < bottom || p >= top)
-                                printk("         ");
-                        else {
-                                if (__get_user(val, (unsigned int __user *)p)) {
-                                        printk("\n");
-                                        return;
-                                }
-                                printk("%08x ", val);
-                        }
-                }
-                printk("\n");
-        }
-}
-
-static DEFINE_SPINLOCK(die_lock);
-
-void die(const char * str, struct pt_regs * regs, long err)
-{
-        static int die_counter;
-
-        oops_enter();
-
-        console_verbose();
-        spin_lock_irq(&die_lock);
-        bust_spinlocks(1);
-
-        printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
-
-        CHK_REMOTE_DEBUG(regs);
-        print_modules();
-        show_regs(regs);
-
-        printk("Process: %s (pid: %d, stack limit = %p)\n", current->comm,
-                        task_pid_nr(current), task_stack_page(current) + 1);
-
-        if (!user_mode(regs) || in_interrupt())
-                dump_mem("Stack: ", regs->regs[15], THREAD_SIZE +
-                         (unsigned long)task_stack_page(current));
-
-        bust_spinlocks(0);
-        add_taint(TAINT_DIE);
-        spin_unlock_irq(&die_lock);
-
-        if (kexec_should_crash(current))
-                crash_kexec(regs);
-
-        if (in_interrupt())
-                panic("Fatal exception in interrupt");
-
-        if (panic_on_oops)
-                panic("Fatal exception");
-
-        oops_exit();
-        do_exit(SIGSEGV);
-}
-
-static inline void die_if_kernel(const char *str, struct pt_regs *regs,
-                                 long err)
-{
-        if (!user_mode(regs))
-                die(str, regs, err);
-}
-
-/*
- * try and fix up kernelspace address errors
- * - userspace errors just cause EFAULT to be returned, resulting in SEGV
- * - kernel/userspace interfaces cause a jump to an appropriate handler
- * - other kernel errors are bad
- * - return 0 if fixed-up, -EFAULT if non-fatal (to the kernel) fault
- */
-static int die_if_no_fixup(const char * str, struct pt_regs * regs, long err)
-{
-        if (!user_mode(regs)) {
-                const struct exception_table_entry *fixup;
-                fixup = search_exception_tables(regs->pc);
-                if (fixup) {
-                        regs->pc = fixup->fixup;
-                        return 0;
-                }
-                die(str, regs, err);
-        }
-        return -EFAULT;
-}
-
-/*
- * handle an instruction that does an unaligned memory access by emulating the
- * desired behaviour
- * - note that PC _may not_ point to the faulting instruction
- *   (if that instruction is in a branch delay slot)
- * - return 0 if emulation okay, -EFAULT on existential error
- */
-static int handle_unaligned_ins(u16 instruction, struct pt_regs *regs)
-{
-        int ret, index, count;
-        unsigned long *rm, *rn;
-        unsigned char *src, *dst;
-
-        index = (instruction>>8)&15;    /* 0x0F00 */
-        rn = &regs->regs[index];
-
-        index = (instruction>>4)&15;    /* 0x00F0 */
-        rm = &regs->regs[index];
-
-        count = 1<<(instruction&3);
-
-        ret = -EFAULT;
-        switch (instruction>>12) {
-        case 0: /* mov.[bwl] to/from memory via r0+rn */
-                if (instruction & 8) {
-                        /* from memory */
-                        src = (unsigned char*) *rm;
-                        src += regs->regs[0];
-                        dst = (unsigned char*) rn;
-                        *(unsigned long*)dst = 0;
-
-#ifdef __LITTLE_ENDIAN__
-                        if (copy_from_user(dst, src, count))
-                                goto fetch_fault;
-
-                        if ((count == 2) && dst[1] & 0x80) {
-                                dst[2] = 0xff;
-                                dst[3] = 0xff;
-                        }
-#else
-                        dst += 4-count;
-
-                        if (__copy_user(dst, src, count))
-                                goto fetch_fault;
-
-                        if ((count == 2) && dst[2] & 0x80) {
-                                dst[0] = 0xff;
-                                dst[1] = 0xff;
-                        }
-#endif
-                } else {
-                        /* to memory */
-                        src = (unsigned char*) rm;
-#if !defined(__LITTLE_ENDIAN__)
-                        src += 4-count;
-#endif
-                        dst = (unsigned char*) *rn;
-                        dst += regs->regs[0];
-
-                        if (copy_to_user(dst, src, count))
-                                goto fetch_fault;
-                }
-                ret = 0;
-                break;
-
-        case 1: /* mov.l Rm,@(disp,Rn) */
-                src = (unsigned char*) rm;
-                dst = (unsigned char*) *rn;
-                dst += (instruction&0x000F)<<2;
-
-                if (copy_to_user(dst,src,4))
-                        goto fetch_fault;
-                ret = 0;
-                break;
-
-        case 2: /* mov.[bwl] to memory, possibly with pre-decrement */
-                if (instruction & 4)
-                        *rn -= count;
-                src = (unsigned char*) rm;
-                dst = (unsigned char*) *rn;
-#if !defined(__LITTLE_ENDIAN__)
-                src += 4-count;
-#endif
-                if (copy_to_user(dst, src, count))
-                        goto fetch_fault;
-                ret = 0;
-                break;
-
-        case 5: /* mov.l @(disp,Rm),Rn */
-                src = (unsigned char*) *rm;
-                src += (instruction&0x000F)<<2;
-                dst = (unsigned char*) rn;
-                *(unsigned long*)dst = 0;
-
-                if (copy_from_user(dst,src,4))
-                        goto fetch_fault;
-                ret = 0;
-                break;
 
-        case 6: /* mov.[bwl] from memory, possibly with post-increment */
-                src = (unsigned char*) *rm;
-                if (instruction & 4)
-                        *rm += count;
-                dst = (unsigned char*) rn;
-                *(unsigned long*)dst = 0;
-
-#ifdef __LITTLE_ENDIAN__
-                if (copy_from_user(dst, src, count))
-                        goto fetch_fault;
-
-                if ((count == 2) && dst[1] & 0x80) {
-                        dst[2] = 0xff;
-                        dst[3] = 0xff;
-                }
-#else
-                dst += 4-count;
-
-                if (copy_from_user(dst, src, count))
-                        goto fetch_fault;
-
-                if ((count == 2) && dst[2] & 0x80) {
-                        dst[0] = 0xff;
-                        dst[1] = 0xff;
-                }
-#endif
-                ret = 0;
-                break;
-
-        case 8:
-                switch ((instruction&0xFF00)>>8) {
-                case 0x81: /* mov.w R0,@(disp,Rn) */
-                        src = (unsigned char*) &regs->regs[0];
-#if !defined(__LITTLE_ENDIAN__)
-                        src += 2;
-#endif
-                        dst = (unsigned char*) *rm; /* called Rn in the spec */
-                        dst += (instruction&0x000F)<<1;
-
-                        if (copy_to_user(dst, src, 2))
-                                goto fetch_fault;
-                        ret = 0;
-                        break;
-
-                case 0x85: /* mov.w @(disp,Rm),R0 */
-                        src = (unsigned char*) *rm;
-                        src += (instruction&0x000F)<<1;
-                        dst = (unsigned char*) &regs->regs[0];
-                        *(unsigned long*)dst = 0;
-
-#if !defined(__LITTLE_ENDIAN__)
-                        dst += 2;
-#endif
-
-                        if (copy_from_user(dst, src, 2))
-                                goto fetch_fault;
-
-#ifdef __LITTLE_ENDIAN__
-                        if (dst[1] & 0x80) {
-                                dst[2] = 0xff;
-                                dst[3] = 0xff;
-                        }
-#else
-                        if (dst[2] & 0x80) {
-                                dst[0] = 0xff;
-                                dst[1] = 0xff;
-                        }
-#endif
-                        ret = 0;
-                        break;
-                }
-                break;
-        }
-        return ret;
-
- fetch_fault:
-        /* Argh. Address not only misaligned but also non-existent.
-         * Raise an EFAULT and see if it's trapped
-         */
-        return die_if_no_fixup("Fault in unaligned fixup", regs, 0);
-}
-
-/*
- * emulate the instruction in the delay slot
- * - fetches the instruction from PC+2
- */
-static inline int handle_unaligned_delayslot(struct pt_regs *regs)
+#ifdef CONFIG_BUG
+static void handle_BUG(struct pt_regs *regs)
 {
-        u16 instruction;
-
-        if (copy_from_user(&instruction, (u16 *)(regs->pc+2), 2)) {
-                /* the instruction-fetch faulted */
-                if (user_mode(regs))
-                        return -EFAULT;
-
-                /* kernel */
-                die("delay-slot-insn faulting in handle_unaligned_delayslot",
-                    regs, 0);
+        enum bug_trap_type tt;
+        tt = report_bug(regs->pc, regs);
+        if (tt == BUG_TRAP_TYPE_WARN) {
+                regs->pc += instruction_size(regs->pc);
+                return;
         }
 
-        return handle_unaligned_ins(instruction,regs);
+        die("Kernel BUG", regs, TRAPA_BUG_OPCODE & 0xff);
 }
 
-/*
- * handle an instruction that does an unaligned memory access
- * - have to be careful of branch delay-slot instructions that fault
- *  SH3:
- *   - if the branch would be taken PC points to the branch
- *   - if the branch would not be taken, PC points to delay-slot
- *  SH4:
- *   - PC always points to delayed branch
- * - return 0 if handled, -EFAULT if failed (may not return if in kernel)
- */
-
-/* Macros to determine offset from current PC for branch instructions */
-/* Explicit type coercion is used to force sign extension where needed */
-#define SH_PC_8BIT_OFFSET(instr) ((((signed char)(instr))*2) + 4)
-#define SH_PC_12BIT_OFFSET(instr) ((((signed short)(instr<<4))>>3) + 4)
-
-/*
- * XXX: SH-2A needs this too, but it needs an overhaul thanks to mixed 32-bit
- * opcodes..
- */
-#ifndef CONFIG_CPU_SH2A
-static int handle_unaligned_notify_count = 10;
-
-static int handle_unaligned_access(u16 instruction, struct pt_regs *regs)
+int is_valid_bugaddr(unsigned long addr)
 {
-        u_int rm;
-        int ret, index;
-
-        index = (instruction>>8)&15;    /* 0x0F00 */
-        rm = regs->regs[index];
-
-        /* shout about the first ten userspace fixups */
-        if (user_mode(regs) && handle_unaligned_notify_count>0) {
-                handle_unaligned_notify_count--;
-
-                printk(KERN_NOTICE "Fixing up unaligned userspace access "
-                       "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
-                       current->comm, task_pid_nr(current),
-                       (u16 *)regs->pc, instruction);
-        }
-
-        ret = -EFAULT;
-        switch (instruction&0xF000) {
-        case 0x0000:
-                if (instruction==0x000B) {
-                        /* rts */
-                        ret = handle_unaligned_delayslot(regs);
-                        if (ret==0)
-                                regs->pc = regs->pr;
-                }
-                else if ((instruction&0x00FF)==0x0023) {
-                        /* braf @Rm */
-                        ret = handle_unaligned_delayslot(regs);
-                        if (ret==0)
-                                regs->pc += rm + 4;
-                }
-                else if ((instruction&0x00FF)==0x0003) {
-                        /* bsrf @Rm */
-                        ret = handle_unaligned_delayslot(regs);
-                        if (ret==0) {
-                                regs->pr = regs->pc + 4;
-                                regs->pc += rm + 4;
-                        }
-                }
-                else {
-                        /* mov.[bwl] to/from memory via r0+rn */
-                        goto simple;
-                }
-                break;
-
-        case 0x1000: /* mov.l Rm,@(disp,Rn) */
-                goto simple;
-
-        case 0x2000: /* mov.[bwl] to memory, possibly with pre-decrement */
-                goto simple;
-
-        case 0x4000:
-                if ((instruction&0x00FF)==0x002B) {
-                        /* jmp @Rm */
-                        ret = handle_unaligned_delayslot(regs);
-                        if (ret==0)
-                                regs->pc = rm;
-                }
-                else if ((instruction&0x00FF)==0x000B) {
-                        /* jsr @Rm */
-                        ret = handle_unaligned_delayslot(regs);
-                        if (ret==0) {
-                                regs->pr = regs->pc + 4;
-                                regs->pc = rm;
-                        }
-                }
-                else {
-                        /* mov.[bwl] to/from memory via r0+rn */
-                        goto simple;
-                }
-                break;
-
-        case 0x5000: /* mov.l @(disp,Rm),Rn */
-                goto simple;
-
-        case 0x6000: /* mov.[bwl] from memory, possibly with post-increment */
-                goto simple;
-
-        case 0x8000: /* bf lab, bf/s lab, bt lab, bt/s lab */
-                switch (instruction&0x0F00) {
-                case 0x0100: /* mov.w R0,@(disp,Rm) */
-                        goto simple;
-                case 0x0500: /* mov.w @(disp,Rm),R0 */
-                        goto simple;
-                case 0x0B00: /* bf   lab - no delayslot*/
-                        break;
-                case 0x0F00: /* bf/s lab */
-                        ret = handle_unaligned_delayslot(regs);
-                        if (ret==0) {
-#if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)
-                                if ((regs->sr & 0x00000001) != 0)
-                                        regs->pc += 4; /* next after slot */
-                                else
-#endif
-                                        regs->pc += SH_PC_8BIT_OFFSET(instruction);
-                        }
-                        break;
-                case 0x0900: /* bt   lab - no delayslot */
-                        break;
-                case 0x0D00: /* bt/s lab */
-                        ret = handle_unaligned_delayslot(regs);
-                        if (ret==0) {
-#if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)
-                                if ((regs->sr & 0x00000001) == 0)
-                                        regs->pc += 4; /* next after slot */
-                                else
-#endif
-                                        regs->pc += SH_PC_8BIT_OFFSET(instruction);
-                        }
-                        break;
-                }
-                break;
-
-        case 0xA000: /* bra label */
-                ret = handle_unaligned_delayslot(regs);
-                if (ret==0)
-                        regs->pc += SH_PC_12BIT_OFFSET(instruction);
-                break;
-
-        case 0xB000: /* bsr label */
-                ret = handle_unaligned_delayslot(regs);
-                if (ret==0) {
-                        regs->pr = regs->pc + 4;
-                        regs->pc += SH_PC_12BIT_OFFSET(instruction);
-                }
-                break;
-        }
-        return ret;
-
-        /* handle non-delay-slot instruction */
- simple:
-        ret = handle_unaligned_ins(instruction,regs);
-        if (ret==0)
-                regs->pc += instruction_size(instruction);
-        return ret;
+        return addr >= PAGE_OFFSET;
 }
-#endif /* CONFIG_CPU_SH2A */
-
-#ifdef CONFIG_CPU_HAS_SR_RB
-#define lookup_exception_vector(x)      \
-        __asm__ __volatile__ ("stc r2_bank, %0\n\t" : "=r" ((x)))
-#else
-#define lookup_exception_vector(x)      \
-        __asm__ __volatile__ ("mov r4, %0\n\t" : "=r" ((x)))
 #endif
 
 /*
- * Handle various address error exceptions:
- *  - instruction address error:
- *       misaligned PC
- *       PC >= 0x80000000 in user mode
- *  - data address error (read and write)
- *       misaligned data access
- *       access to >= 0x80000000 is user mode
- * Unfortuntaly we can't distinguish between instruction address error
- * and data address errors caused by read accesses.
+ * Generic trap handler.
  */
-asmlinkage void do_address_error(struct pt_regs *regs,
-                                 unsigned long writeaccess,
-                                 unsigned long address)
+BUILD_TRAP_HANDLER(debug)
 {
-        unsigned long error_code = 0;
-        mm_segment_t oldfs;
-        siginfo_t info;
-#ifndef CONFIG_CPU_SH2A
-        u16 instruction;
-        int tmp;
-#endif
-
-        /* Intentional ifdef */
-#ifdef CONFIG_CPU_HAS_SR_RB
-        lookup_exception_vector(error_code);
-#endif
-
-        oldfs = get_fs();
-
-        if (user_mode(regs)) {
-                int si_code = BUS_ADRERR;
-
-                local_irq_enable();
+        TRAP_HANDLER_DECL;
 
-                /* bad PC is not something we can fix */
-                if (regs->pc & 1) {
-                        si_code = BUS_ADRALN;
-                        goto uspace_segv;
-                }
+        /* Rewind */
+        regs->pc -= instruction_size(ctrl_inw(regs->pc - 4));
 
-#ifndef CONFIG_CPU_SH2A
-                set_fs(USER_DS);
-                if (copy_from_user(&instruction, (u16 *)(regs->pc), 2)) {
-                        /* Argh. Fault on the instruction itself.
-                           This should never happen non-SMP
-                        */
-                        set_fs(oldfs);
-                        goto uspace_segv;
-                }
-
-                tmp = handle_unaligned_access(instruction, regs);
-                set_fs(oldfs);
-
-                if (tmp==0)
-                        return; /* sorted */
-#endif
-
-uspace_segv:
-                printk(KERN_NOTICE "Sending SIGBUS to \"%s\" due to unaligned "
-                       "access (PC %lx PR %lx)\n", current->comm, regs->pc,
-                       regs->pr);
-
-                info.si_signo = SIGBUS;
-                info.si_errno = 0;
-                info.si_code = si_code;
-                info.si_addr = (void __user *)address;
-                force_sig_info(SIGBUS, &info, current);
-        } else {
-                if (regs->pc & 1)
-                        die("unaligned program counter", regs, error_code);
-
-#ifndef CONFIG_CPU_SH2A
-                set_fs(KERNEL_DS);
-                if (copy_from_user(&instruction, (u16 *)(regs->pc), 2)) {
-                        /* Argh. Fault on the instruction itself.
-                           This should never happen non-SMP
-                        */
-                        set_fs(oldfs);
-                        die("insn faulting in do_address_error", regs, 0);
-                }
-
-                handle_unaligned_access(instruction, regs);
-                set_fs(oldfs);
-#else
-                printk(KERN_NOTICE "Killing process \"%s\" due to unaligned "
-                       "access\n", current->comm);
+        if (notify_die(DIE_TRAP, "debug trap", regs, 0, vec & 0xff,
+                       SIGTRAP) == NOTIFY_STOP)
+                return;
 
-                force_sig(SIGSEGV, current);
-#endif
-        }
+        force_sig(SIGTRAP, current);
 }
 
-#ifdef CONFIG_SH_DSP
 /*
- *      SH-DSP support gerg@snapgear.com.
+ * Special handler for BUG() traps.
  */
-int is_dsp_inst(struct pt_regs *regs)
+BUILD_TRAP_HANDLER(bug)
 {
-        unsigned short inst = 0;
-
-        /*
-         * Safe guard if DSP mode is already enabled or we're lacking
-         * the DSP altogether.
-         */
-        if (!(current_cpu_data.flags & CPU_HAS_DSP) || (regs->sr & SR_DSP))
-                return 0;
-
-        get_user(inst, ((unsigned short *) regs->pc));
-
-        inst &= 0xf000;
-
-        /* Check for any type of DSP or support instruction */
-        if ((inst == 0xf000) || (inst == 0x4000))
-                return 1;
-
-        return 0;
-}
-#else
-#define is_dsp_inst(regs)       (0)
-#endif /* CONFIG_SH_DSP */
+        TRAP_HANDLER_DECL;
 
-#ifdef CONFIG_CPU_SH2A
-asmlinkage void do_divide_error(unsigned long r4, unsigned long r5,
-                                unsigned long r6, unsigned long r7,
-                                struct pt_regs __regs)
-{
-        siginfo_t info;
-
-        switch (r4) {
-        case TRAP_DIVZERO_ERROR:
-                info.si_code = FPE_INTDIV;
-                break;
-        case TRAP_DIVOVF_ERROR:
-                info.si_code = FPE_INTOVF;
-                break;
-        }
-
-        force_sig_info(SIGFPE, &info, current);
-}
-#endif
-
-/* arch/sh/kernel/cpu/sh4/fpu.c */
-extern int do_fpu_inst(unsigned short, struct pt_regs *);
-extern asmlinkage void do_fpu_state_restore(unsigned long r4, unsigned long r5,
-                unsigned long r6, unsigned long r7, struct pt_regs __regs);
-
-asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
-                                unsigned long r6, unsigned long r7,
-                                struct pt_regs __regs)
-{
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
-        unsigned long error_code;
-        struct task_struct *tsk = current;
-
-#ifdef CONFIG_SH_FPU_EMU
-        unsigned short inst = 0;
-        int err;
-
-        get_user(inst, (unsigned short*)regs->pc);
-
-        err = do_fpu_inst(inst, regs);
-        if (!err) {
-                regs->pc += instruction_size(inst);
-                return;
-        }
-        /* not a FPU inst. */
-#endif
+        /* Rewind */
+        regs->pc -= instruction_size(ctrl_inw(regs->pc - 4));
 
-#ifdef CONFIG_SH_DSP
-        /* Check if it's a DSP instruction */
-        if (is_dsp_inst(regs)) {
-                /* Enable DSP mode, and restart instruction. */
-                regs->sr |= SR_DSP;
+        if (notify_die(DIE_TRAP, "bug trap", regs, 0, TRAPA_BUG_OPCODE & 0xff,
+                       SIGTRAP) == NOTIFY_STOP)
                 return;
-        }
-#endif
-
-        lookup_exception_vector(error_code);
-
-        local_irq_enable();
-        CHK_REMOTE_DEBUG(regs);
-        force_sig(SIGILL, tsk);
-        die_if_no_fixup("reserved instruction", regs, error_code);
-}
-
-#ifdef CONFIG_SH_FPU_EMU
-static int emulate_branch(unsigned short inst, struct pt_regs* regs)
-{
-        /*
-         * bfs: 8fxx: PC+=d*2+4;
-         * bts: 8dxx: PC+=d*2+4;
-         * bra: axxx: PC+=D*2+4;
-         * bsr: bxxx: PC+=D*2+4  after PR=PC+4;
-         * braf:0x23: PC+=Rn*2+4;
-         * bsrf:0x03: PC+=Rn*2+4 after PR=PC+4;
-         * jmp: 4x2b: PC=Rn;
-         * jsr: 4x0b: PC=Rn      after PR=PC+4;
-         * rts: 000b: PC=PR;
-         */
-        if ((inst & 0xfd00) == 0x8d00) {
-                regs->pc += SH_PC_8BIT_OFFSET(inst);
-                return 0;
-        }
-
-        if ((inst & 0xe000) == 0xa000) {
-                regs->pc += SH_PC_12BIT_OFFSET(inst);
-                return 0;
-        }
-
-        if ((inst & 0xf0df) == 0x0003) {
-                regs->pc += regs->regs[(inst & 0x0f00) >> 8] + 4;
-                return 0;
-        }
-
-        if ((inst & 0xf0df) == 0x400b) {
-                regs->pc = regs->regs[(inst & 0x0f00) >> 8];
-                return 0;
-        }
-
-        if ((inst & 0xffff) == 0x000b) {
-                regs->pc = regs->pr;
-                return 0;
-        }
-
-        return 1;
-}
-#endif
-
-asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5,
-                                unsigned long r6, unsigned long r7,
-                                struct pt_regs __regs)
-{
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
-        unsigned long error_code;
-        struct task_struct *tsk = current;
-#ifdef CONFIG_SH_FPU_EMU
-        unsigned short inst = 0;
-
-        get_user(inst, (unsigned short *)regs->pc + 1);
-        if (!do_fpu_inst(inst, regs)) {
-                get_user(inst, (unsigned short *)regs->pc);
-                if (!emulate_branch(inst, regs))
-                        return;
-                /* fault in branch.*/
-        }
-        /* not a FPU inst. */
-#endif
-
-        lookup_exception_vector(error_code);
-
-        local_irq_enable();
-        CHK_REMOTE_DEBUG(regs);
-        force_sig(SIGILL, tsk);
-        die_if_no_fixup("illegal slot instruction", regs, error_code);
-}
-
-asmlinkage void do_exception_error(unsigned long r4, unsigned long r5,
-                                   unsigned long r6, unsigned long r7,
-                                   struct pt_regs __regs)
-{
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
-        long ex;
-
-        lookup_exception_vector(ex);
-        die_if_kernel("exception", regs, ex);
-}
-
-#if defined(CONFIG_SH_STANDARD_BIOS)
-void *gdb_vbr_vector;
-
-static inline void __init gdb_vbr_init(void)
-{
-        register unsigned long vbr;
-
-        /*
-         * Read the old value of the VBR register to initialise
-         * the vector through which debug and BIOS traps are
-         * delegated by the Linux trap handler.
-         */
-        asm volatile("stc vbr, %0" : "=r" (vbr));
-
-        gdb_vbr_vector = (void *)(vbr + 0x100);
-        printk("Setting GDB trap vector to 0x%08lx\n",
-               (unsigned long)gdb_vbr_vector);
-}
-#endif
-
-void __cpuinit per_cpu_trap_init(void)
-{
-        extern void *vbr_base;
-
-#ifdef CONFIG_SH_STANDARD_BIOS
-        if (raw_smp_processor_id() == 0)
-                gdb_vbr_init();
-#endif
-
-        /* NOTE: The VBR value should be at P1
-           (or P2, virtural "fixed" address space).
-           It's definitely should not in physical address.  */
-
-        asm volatile("ldc       %0, vbr"
-                     : /* no output */
-                     : "r" (&vbr_base)
-                     : "memory");
-}
-
-void *set_exception_table_vec(unsigned int vec, void *handler)
-{
-        extern void *exception_handling_table[];
-        void *old_handler;
-
-        old_handler = exception_handling_table[vec];
-        exception_handling_table[vec] = handler;
-        return old_handler;
-}
-
-extern asmlinkage void address_error_handler(unsigned long r4, unsigned long r5,
-                                             unsigned long r6, unsigned long r7,
-                                             struct pt_regs __regs);
-
-void __init trap_init(void)
-{
-        set_exception_table_vec(TRAP_RESERVED_INST, do_reserved_inst);
-        set_exception_table_vec(TRAP_ILLEGAL_SLOT_INST, do_illegal_slot_inst);
-
-#if defined(CONFIG_CPU_SH4) && !defined(CONFIG_SH_FPU) || \
-    defined(CONFIG_SH_FPU_EMU)
-        /*
-         * For SH-4 lacking an FPU, treat floating point instructions as
-         * reserved. They'll be handled in the math-emu case, or faulted on
-         * otherwise.
-         */
-        set_exception_table_evt(0x800, do_reserved_inst);
-        set_exception_table_evt(0x820, do_illegal_slot_inst);
-#elif defined(CONFIG_SH_FPU)
-#ifdef CONFIG_CPU_SUBTYPE_SHX3
-        set_exception_table_evt(0xd80, do_fpu_state_restore);
-        set_exception_table_evt(0xda0, do_fpu_state_restore);
-#else
-        set_exception_table_evt(0x800, do_fpu_state_restore);
-        set_exception_table_evt(0x820, do_fpu_state_restore);
-#endif
-#endif
-
-#ifdef CONFIG_CPU_SH2
-        set_exception_table_vec(TRAP_ADDRESS_ERROR, address_error_handler);
-#endif
-#ifdef CONFIG_CPU_SH2A
-        set_exception_table_vec(TRAP_DIVZERO_ERROR, do_divide_error);
-        set_exception_table_vec(TRAP_DIVOVF_ERROR, do_divide_error);
-#endif
-
-        /* Setup VBR for boot cpu */
-        per_cpu_trap_init();
-}
 
 #ifdef CONFIG_BUG
-void handle_BUG(struct pt_regs *regs)
-{
-        enum bug_trap_type tt;
-        tt = report_bug(regs->pc, regs);
-        if (tt == BUG_TRAP_TYPE_WARN) {
-                regs->pc += 2;
-                return;
+        if (__kernel_text_address(instruction_pointer(regs))) {
+                opcode_t insn = *(opcode_t *)instruction_pointer(regs);
+                if (insn == TRAPA_BUG_OPCODE)
+                        handle_BUG(regs);
         }
-
-        die("Kernel BUG", regs, TRAPA_BUG_OPCODE & 0xff);
-}
-
-int is_valid_bugaddr(unsigned long addr)
-{
-        return addr >= PAGE_OFFSET;
-}
-#endif
-
-void show_trace(struct task_struct *tsk, unsigned long *sp,
-                struct pt_regs *regs)
-{
-        unsigned long addr;
-
-        if (regs && user_mode(regs))
-                return;
-
-        printk("\nCall trace: ");
-#ifdef CONFIG_KALLSYMS
-        printk("\n");
 #endif
 
-        while (!kstack_end(sp)) {
-                addr = *sp++;
-                if (kernel_text_address(addr))
-                        print_ip_sym(addr);
-        }
-
-        printk("\n");
-
-        if (!tsk)
-                tsk = current;
-
-        debug_show_held_locks(tsk);
-}
-
-void show_stack(struct task_struct *tsk, unsigned long *sp)
-{
-        unsigned long stack;
-
-        if (!tsk)
-                tsk = current;
-        if (tsk == current)
-                sp = (unsigned long *)current_stack_pointer;
-        else
-                sp = (unsigned long *)tsk->thread.sp;
-
-        stack = (unsigned long)sp;
-        dump_mem("Stack: ", stack, THREAD_SIZE +
-                 (unsigned long)task_stack_page(tsk));
-        show_trace(tsk, sp, NULL);
-}
-
-void dump_stack(void)
-{
-        show_stack(NULL, NULL);
+        force_sig(SIGTRAP, current);
 }
-EXPORT_SYMBOL(dump_stack);
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
new file mode 100644
index 000000000000..2e58f7a6b746
--- /dev/null
+++ b/arch/sh/kernel/traps_32.c
@@ -0,0 +1,919 @@
+/*
+ * 'traps.c' handles hardware traps and faults after we have saved some
+ * state in 'entry.S'.
+ *
+ *  SuperH version: Copyright (C) 1999 Niibe Yutaka
+ *                  Copyright (C) 2000 Philipp Rumpf
+ *                  Copyright (C) 2000 David Howells
+ *                  Copyright (C) 2002 - 2007 Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/kernel.h>
+#include <linux/ptrace.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/module.h>
+#include <linux/kallsyms.h>
+#include <linux/io.h>
+#include <linux/bug.h>
+#include <linux/debug_locks.h>
+#include <linux/kdebug.h>
+#include <linux/kexec.h>
+#include <linux/limits.h>
+#include <asm/system.h>
+#include <asm/uaccess.h>
+
+#ifdef CONFIG_SH_KGDB
+#include <asm/kgdb.h>
+#define CHK_REMOTE_DEBUG(regs)                  \
+{                                               \
+        if (kgdb_debug_hook && !user_mode(regs))\
+                (*kgdb_debug_hook)(regs);       \
+}
+#else
+#define CHK_REMOTE_DEBUG(regs)
+#endif
+
+#ifdef CONFIG_CPU_SH2
+# define TRAP_RESERVED_INST     4
+# define TRAP_ILLEGAL_SLOT_INST 6
+# define TRAP_ADDRESS_ERROR     9
+# ifdef CONFIG_CPU_SH2A
+#  define TRAP_DIVZERO_ERROR    17
+#  define TRAP_DIVOVF_ERROR     18
+# endif
+#else
+#define TRAP_RESERVED_INST      12
+#define TRAP_ILLEGAL_SLOT_INST  13
+#endif
+
+static void dump_mem(const char *str, unsigned long bottom, unsigned long top)
+{
+        unsigned long p;
+        int i;
+
+        printk("%s(0x%08lx to 0x%08lx)\n", str, bottom, top);
+
+        for (p = bottom & ~31; p < top; ) {
+                printk("%04lx: ", p & 0xffff);
+
+                for (i = 0; i < 8; i++, p += 4) {
+                        unsigned int val;
+
+                        if (p < bottom || p >= top)
+                                printk("         ");
+                        else {
+                                if (__get_user(val, (unsigned int __user *)p)) {
+                                        printk("\n");
+                                        return;
+                                }
+                                printk("%08x ", val);
+                        }
+                }
+                printk("\n");
+        }
+}
+
+static DEFINE_SPINLOCK(die_lock);
+
+void die(const char * str, struct pt_regs * regs, long err)
+{
+        static int die_counter;
+
+        oops_enter();
+
+        console_verbose();
+        spin_lock_irq(&die_lock);
+        bust_spinlocks(1);
+
+        printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
+
+        CHK_REMOTE_DEBUG(regs);
+        print_modules();
+        show_regs(regs);
+
+        printk("Process: %s (pid: %d, stack limit = %p)\n", current->comm,
+                        task_pid_nr(current), task_stack_page(current) + 1);
+
+        if (!user_mode(regs) || in_interrupt())
+                dump_mem("Stack: ", regs->regs[15], THREAD_SIZE +
+                         (unsigned long)task_stack_page(current));
+
+        bust_spinlocks(0);
+        add_taint(TAINT_DIE);
+        spin_unlock_irq(&die_lock);
+
+        if (kexec_should_crash(current))
+                crash_kexec(regs);
+
+        if (in_interrupt())
+                panic("Fatal exception in interrupt");
+
+        if (panic_on_oops)
+                panic("Fatal exception");
+
+        oops_exit();
+        do_exit(SIGSEGV);
+}
+
+static inline void die_if_kernel(const char *str, struct pt_regs *regs,
+                                 long err)
+{
+        if (!user_mode(regs))
+                die(str, regs, err);
+}
+
+/*
+ * try and fix up kernelspace address errors
+ * - userspace errors just cause EFAULT to be returned, resulting in SEGV
+ * - kernel/userspace interfaces cause a jump to an appropriate handler
+ * - other kernel errors are bad
+ * - return 0 if fixed-up, -EFAULT if non-fatal (to the kernel) fault
+ */
+static int die_if_no_fixup(const char * str, struct pt_regs * regs, long err)
+{
+        if (!user_mode(regs)) {
+                const struct exception_table_entry *fixup;
+                fixup = search_exception_tables(regs->pc);
+                if (fixup) {
+                        regs->pc = fixup->fixup;
+                        return 0;
+                }
+                die(str, regs, err);
+        }
+        return -EFAULT;
+}
+
+/*
+ * handle an instruction that does an unaligned memory access by emulating the
+ * desired behaviour
+ * - note that PC _may not_ point to the faulting instruction
+ *   (if that instruction is in a branch delay slot)
+ * - return 0 if emulation okay, -EFAULT on existential error
+ */
+static int handle_unaligned_ins(u16 instruction, struct pt_regs *regs)
+{
+        int ret, index, count;
+        unsigned long *rm, *rn;
+        unsigned char *src, *dst;
+
+        index = (instruction>>8)&15;    /* 0x0F00 */
+        rn = &regs->regs[index];
+
+        index = (instruction>>4)&15;    /* 0x00F0 */
+        rm = &regs->regs[index];
+
+        count = 1<<(instruction&3);
+
+        ret = -EFAULT;
+        switch (instruction>>12) {
+        case 0: /* mov.[bwl] to/from memory via r0+rn */
+                if (instruction & 8) {
+                        /* from memory */
+                        src = (unsigned char*) *rm;
+                        src += regs->regs[0];
+                        dst = (unsigned char*) rn;
+                        *(unsigned long*)dst = 0;
+
+#ifdef __LITTLE_ENDIAN__
+                        if (copy_from_user(dst, src, count))
+                                goto fetch_fault;
+
+                        if ((count == 2) && dst[1] & 0x80) {
+                                dst[2] = 0xff;
+                                dst[3] = 0xff;
+                        }
+#else
+                        dst += 4-count;
+
+                        if (__copy_user(dst, src, count))
+                                goto fetch_fault;
+
+                        if ((count == 2) && dst[2] & 0x80) {
+                                dst[0] = 0xff;
+                                dst[1] = 0xff;
+                        }
+#endif
+                } else {
+                        /* to memory */
+                        src = (unsigned char*) rm;
+#if !defined(__LITTLE_ENDIAN__)
+                        src += 4-count;
+#endif
+                        dst = (unsigned char*) *rn;
+                        dst += regs->regs[0];
+
+                        if (copy_to_user(dst, src, count))
+                                goto fetch_fault;
+                }
+                ret = 0;
+                break;
+
+        case 1: /* mov.l Rm,@(disp,Rn) */
+                src = (unsigned char*) rm;
+                dst = (unsigned char*) *rn;
+                dst += (instruction&0x000F)<<2;
+
+                if (copy_to_user(dst,src,4))
+                        goto fetch_fault;
+                ret = 0;
+                break;
+
+        case 2: /* mov.[bwl] to memory, possibly with pre-decrement */
+                if (instruction & 4)
+                        *rn -= count;
+                src = (unsigned char*) rm;
+                dst = (unsigned char*) *rn;
+#if !defined(__LITTLE_ENDIAN__)
+                src += 4-count;
+#endif
+                if (copy_to_user(dst, src, count))
+                        goto fetch_fault;
+                ret = 0;
+                break;
+
+        case 5: /* mov.l @(disp,Rm),Rn */
+                src = (unsigned char*) *rm;
+                src += (instruction&0x000F)<<2;
+                dst = (unsigned char*) rn;
+                *(unsigned long*)dst = 0;
+
+                if (copy_from_user(dst,src,4))
+                        goto fetch_fault;
+                ret = 0;
+                break;
+
+        case 6: /* mov.[bwl] from memory, possibly with post-increment */
+                src = (unsigned char*) *rm;
+                if (instruction & 4)
+                        *rm += count;
+                dst = (unsigned char*) rn;
+                *(unsigned long*)dst = 0;
+
+#ifdef __LITTLE_ENDIAN__
+                if (copy_from_user(dst, src, count))
+                        goto fetch_fault;
+
+                if ((count == 2) && dst[1] & 0x80) {
+                        dst[2] = 0xff;
+                        dst[3] = 0xff;
+                }
+#else
+                dst += 4-count;
+
+                if (copy_from_user(dst, src, count))
+                        goto fetch_fault;
+
+                if ((count == 2) && dst[2] & 0x80) {
+                        dst[0] = 0xff;
+                        dst[1] = 0xff;
+                }
+#endif
+                ret = 0;
+                break;
+
+        case 8:
+                switch ((instruction&0xFF00)>>8) {
+                case 0x81: /* mov.w R0,@(disp,Rn) */
+                        src = (unsigned char*) &regs->regs[0];
+#if !defined(__LITTLE_ENDIAN__)
+                        src += 2;
+#endif
+                        dst = (unsigned char*) *rm; /* called Rn in the spec */
+                        dst += (instruction&0x000F)<<1;
+
+                        if (copy_to_user(dst, src, 2))
+                                goto fetch_fault;
+                        ret = 0;
+                        break;
+
+                case 0x85: /* mov.w @(disp,Rm),R0 */
+                        src = (unsigned char*) *rm;
+                        src += (instruction&0x000F)<<1;
+                        dst = (unsigned char*) &regs->regs[0];
+                        *(unsigned long*)dst = 0;
+
+#if !defined(__LITTLE_ENDIAN__)
+                        dst += 2;
+#endif
+
+                        if (copy_from_user(dst, src, 2))
+                                goto fetch_fault;
+
+#ifdef __LITTLE_ENDIAN__
+                        if (dst[1] & 0x80) {
+                                dst[2] = 0xff;
+                                dst[3] = 0xff;
+                        }
+#else
+                        if (dst[2] & 0x80) {
+                                dst[0] = 0xff;
+                                dst[1] = 0xff;
+                        }
+#endif
+                        ret = 0;
+                        break;
+                }
+                break;
+        }
+        return ret;
+
+ fetch_fault:
+        /* Argh. Address not only misaligned but also non-existent.
+         * Raise an EFAULT and see if it's trapped
+         */
+        return die_if_no_fixup("Fault in unaligned fixup", regs, 0);
+}
+
+/*
+ * emulate the instruction in the delay slot
+ * - fetches the instruction from PC+2
+ */
+static inline int handle_unaligned_delayslot(struct pt_regs *regs)
+{
+        u16 instruction;
+
+        if (copy_from_user(&instruction, (u16 *)(regs->pc+2), 2)) {
+                /* the instruction-fetch faulted */
+                if (user_mode(regs))
+                        return -EFAULT;
+
+                /* kernel */
+                die("delay-slot-insn faulting in handle_unaligned_delayslot",
+                    regs, 0);
+        }
+
+        return handle_unaligned_ins(instruction,regs);
+}
+
+/*
+ * handle an instruction that does an unaligned memory access
+ * - have to be careful of branch delay-slot instructions that fault
+ *  SH3:
+ *   - if the branch would be taken PC points to the branch
+ *   - if the branch would not be taken, PC points to delay-slot
+ *  SH4:
+ *   - PC always points to delayed branch
+ * - return 0 if handled, -EFAULT if failed (may not return if in kernel)
+ */
+
+/* Macros to determine offset from current PC for branch instructions */
+/* Explicit type coercion is used to force sign extension where needed */
+#define SH_PC_8BIT_OFFSET(instr) ((((signed char)(instr))*2) + 4)
+#define SH_PC_12BIT_OFFSET(instr) ((((signed short)(instr<<4))>>3) + 4)
+
+/*
+ * XXX: SH-2A needs this too, but it needs an overhaul thanks to mixed 32-bit
+ * opcodes..
+ */
+#ifndef CONFIG_CPU_SH2A
+static int handle_unaligned_notify_count = 10;
+
+static int handle_unaligned_access(u16 instruction, struct pt_regs *regs)
+{
+        u_int rm;
+        int ret, index;
+
+        index = (instruction>>8)&15;    /* 0x0F00 */
+        rm = regs->regs[index];
+
+        /* shout about the first ten userspace fixups */
+        if (user_mode(regs) && handle_unaligned_notify_count>0) {
+                handle_unaligned_notify_count--;
+
+                printk(KERN_NOTICE "Fixing up unaligned userspace access "
+                       "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
+                       current->comm, task_pid_nr(current),
+                       (u16 *)regs->pc, instruction);
+        }
+
+        ret = -EFAULT;
+        switch (instruction&0xF000) {
+        case 0x0000:
+                if (instruction==0x000B) {
+                        /* rts */
+                        ret = handle_unaligned_delayslot(regs);
+                        if (ret==0)
+                                regs->pc = regs->pr;
+                }
+                else if ((instruction&0x00FF)==0x0023) {
+                        /* braf @Rm */
+                        ret = handle_unaligned_delayslot(regs);
+                        if (ret==0)
+                                regs->pc += rm + 4;
+                }
+                else if ((instruction&0x00FF)==0x0003) {
+                        /* bsrf @Rm */
+                        ret = handle_unaligned_delayslot(regs);
+                        if (ret==0) {
+                                regs->pr = regs->pc + 4;
+                                regs->pc += rm + 4;
+                        }
+                }
+                else {
+                        /* mov.[bwl] to/from memory via r0+rn */
+                        goto simple;
+                }
+                break;
+
+        case 0x1000: /* mov.l Rm,@(disp,Rn) */
+                goto simple;
+
+        case 0x2000: /* mov.[bwl] to memory, possibly with pre-decrement */
+                goto simple;
+
+        case 0x4000:
+                if ((instruction&0x00FF)==0x002B) {
+                        /* jmp @Rm */
+                        ret = handle_unaligned_delayslot(regs);
+                        if (ret==0)
+                                regs->pc = rm;
+                }
+                else if ((instruction&0x00FF)==0x000B) {
+                        /* jsr @Rm */
+                        ret = handle_unaligned_delayslot(regs);
+                        if (ret==0) {
+                                regs->pr = regs->pc + 4;
+                                regs->pc = rm;
+                        }
+                }
+                else {
+                        /* mov.[bwl] to/from memory via r0+rn */
+                        goto simple;
+                }
+                break;
+
+        case 0x5000: /* mov.l @(disp,Rm),Rn */
+                goto simple;
+
+        case 0x6000: /* mov.[bwl] from memory, possibly with post-increment */
+                goto simple;
+
+        case 0x8000: /* bf lab, bf/s lab, bt lab, bt/s lab */
+                switch (instruction&0x0F00) {
+                case 0x0100: /* mov.w R0,@(disp,Rm) */
+                        goto simple;
+                case 0x0500: /* mov.w @(disp,Rm),R0 */
+                        goto simple;
+                case 0x0B00: /* bf   lab - no delayslot*/
+                        break;
+                case 0x0F00: /* bf/s lab */
+                        ret = handle_unaligned_delayslot(regs);
+                        if (ret==0) {
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)
+                                if ((regs->sr & 0x00000001) != 0)
+                                        regs->pc += 4; /* next after slot */
+                                else
+#endif
+                                        regs->pc += SH_PC_8BIT_OFFSET(instruction);
+                        }
+                        break;
+                case 0x0900: /* bt   lab - no delayslot */
+                        break;
+                case 0x0D00: /* bt/s lab */
+                        ret = handle_unaligned_delayslot(regs);
+                        if (ret==0) {
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)
+                                if ((regs->sr & 0x00000001) == 0)
+                                        regs->pc += 4; /* next after slot */
+                                else
+#endif
+                                        regs->pc += SH_PC_8BIT_OFFSET(instruction);
+                        }
+                        break;
+                }
+                break;
+
+        case 0xA000: /* bra label */
+                ret = handle_unaligned_delayslot(regs);
+                if (ret==0)
+                        regs->pc += SH_PC_12BIT_OFFSET(instruction);
+                break;
+
+        case 0xB000: /* bsr label */
+                ret = handle_unaligned_delayslot(regs);
+                if (ret==0) {
+                        regs->pr = regs->pc + 4;
+                        regs->pc += SH_PC_12BIT_OFFSET(instruction);
+                }
+                break;
+        }
+        return ret;
+
+        /* handle non-delay-slot instruction */
+ simple:
+        ret = handle_unaligned_ins(instruction,regs);
+        if (ret==0)
+                regs->pc += instruction_size(instruction);
+        return ret;
+}
+#endif /* CONFIG_CPU_SH2A */
+
+#ifdef CONFIG_CPU_HAS_SR_RB
+#define lookup_exception_vector(x)      \
+        __asm__ __volatile__ ("stc r2_bank, %0\n\t" : "=r" ((x)))
+#else
+#define lookup_exception_vector(x)      \
+        __asm__ __volatile__ ("mov r4, %0\n\t" : "=r" ((x)))
+#endif
+
+/*
+ * Handle various address error exceptions:
+ *  - instruction address error:
+ *       misaligned PC
+ *       PC >= 0x80000000 in user mode
+ *  - data address error (read and write)
+ *       misaligned data access
+ *       access to >= 0x80000000 is user mode
+ * Unfortuntaly we can't distinguish between instruction address error
+ * and data address errors caused by read accesses.
+ */
+asmlinkage void do_address_error(struct pt_regs *regs,
+                                 unsigned long writeaccess,
+                                 unsigned long address)
+{
+        unsigned long error_code = 0;
+        mm_segment_t oldfs;
+        siginfo_t info;
+#ifndef CONFIG_CPU_SH2A
+        u16 instruction;
+        int tmp;
+#endif
+
+        /* Intentional ifdef */
+#ifdef CONFIG_CPU_HAS_SR_RB
+        lookup_exception_vector(error_code);
+#endif
+
+        oldfs = get_fs();
+
+        if (user_mode(regs)) {
+                int si_code = BUS_ADRERR;
+
+                local_irq_enable();
+
+                /* bad PC is not something we can fix */
+                if (regs->pc & 1) {
+                        si_code = BUS_ADRALN;
+                        goto uspace_segv;
+                }
+
+#ifndef CONFIG_CPU_SH2A
+                set_fs(USER_DS);
+                if (copy_from_user(&instruction, (u16 *)(regs->pc), 2)) {
+                        /* Argh. Fault on the instruction itself.
+                           This should never happen non-SMP
+                        */
+                        set_fs(oldfs);
+                        goto uspace_segv;
+                }
+
+                tmp = handle_unaligned_access(instruction, regs);
+                set_fs(oldfs);
+
+                if (tmp==0)
+                        return; /* sorted */
+#endif
+
+uspace_segv:
+                printk(KERN_NOTICE "Sending SIGBUS to \"%s\" due to unaligned "
+                       "access (PC %lx PR %lx)\n", current->comm, regs->pc,
+                       regs->pr);
+
+                info.si_signo = SIGBUS;
+                info.si_errno = 0;
+                info.si_code = si_code;
+                info.si_addr = (void __user *)address;
+                force_sig_info(SIGBUS, &info, current);
+        } else {
+                if (regs->pc & 1)
+                        die("unaligned program counter", regs, error_code);
+
+#ifndef CONFIG_CPU_SH2A
+                set_fs(KERNEL_DS);
+                if (copy_from_user(&instruction, (u16 *)(regs->pc), 2)) {
+                        /* Argh. Fault on the instruction itself.
+                           This should never happen non-SMP
+                        */
+                        set_fs(oldfs);
+                        die("insn faulting in do_address_error", regs, 0);
+                }
+
+                handle_unaligned_access(instruction, regs);
+                set_fs(oldfs);
+#else
+                printk(KERN_NOTICE "Killing process \"%s\" due to unaligned "
+                       "access\n", current->comm);
+
+                force_sig(SIGSEGV, current);
+#endif
+        }
+}
+
+#ifdef CONFIG_SH_DSP
+/*
+ *      SH-DSP support gerg@snapgear.com.
+ */
+int is_dsp_inst(struct pt_regs *regs)
+{
+        unsigned short inst = 0;
+
+        /*
+         * Safe guard if DSP mode is already enabled or we're lacking
+         * the DSP altogether.
+         */
+        if (!(current_cpu_data.flags & CPU_HAS_DSP) || (regs->sr & SR_DSP))
+                return 0;
+
+        get_user(inst, ((unsigned short *) regs->pc));
+
+        inst &= 0xf000;
+
+        /* Check for any type of DSP or support instruction */
+        if ((inst == 0xf000) || (inst == 0x4000))
+                return 1;
+
+        return 0;
+}
+#else
+#define is_dsp_inst(regs)       (0)
+#endif /* CONFIG_SH_DSP */
+
+#ifdef CONFIG_CPU_SH2A
+asmlinkage void do_divide_error(unsigned long r4, unsigned long r5,
+                                unsigned long r6, unsigned long r7,
+                                struct pt_regs __regs)
+{
+        siginfo_t info;
+
+        switch (r4) {
+        case TRAP_DIVZERO_ERROR:
+                info.si_code = FPE_INTDIV;
+                break;
+        case TRAP_DIVOVF_ERROR:
+                info.si_code = FPE_INTOVF;
+                break;
+        }
+
+        force_sig_info(SIGFPE, &info, current);
+}
+#endif
+
+asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
+                                unsigned long r6, unsigned long r7,
+                                struct pt_regs __regs)
+{
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        unsigned long error_code;
+        struct task_struct *tsk = current;
+
+#ifdef CONFIG_SH_FPU_EMU
+        unsigned short inst = 0;
+        int err;
+
+        get_user(inst, (unsigned short*)regs->pc);
+
+        err = do_fpu_inst(inst, regs);
+        if (!err) {
+                regs->pc += instruction_size(inst);
+                return;
+        }
+        /* not a FPU inst. */
+#endif
+
+#ifdef CONFIG_SH_DSP
+        /* Check if it's a DSP instruction */
+        if (is_dsp_inst(regs)) {
+                /* Enable DSP mode, and restart instruction. */
+                regs->sr |= SR_DSP;
+                return;
+        }
+#endif
+
+        lookup_exception_vector(error_code);
+
+        local_irq_enable();
+        CHK_REMOTE_DEBUG(regs);
+        force_sig(SIGILL, tsk);
+        die_if_no_fixup("reserved instruction", regs, error_code);
+}
+
+#ifdef CONFIG_SH_FPU_EMU
+static int emulate_branch(unsigned short inst, struct pt_regs* regs)
+{
+        /*
+         * bfs: 8fxx: PC+=d*2+4;
+         * bts: 8dxx: PC+=d*2+4;
+         * bra: axxx: PC+=D*2+4;
+         * bsr: bxxx: PC+=D*2+4  after PR=PC+4;
+         * braf:0x23: PC+=Rn*2+4;
+         * bsrf:0x03: PC+=Rn*2+4 after PR=PC+4;
+         * jmp: 4x2b: PC=Rn;
+         * jsr: 4x0b: PC=Rn      after PR=PC+4;
+         * rts: 000b: PC=PR;
+         */
+        if ((inst & 0xfd00) == 0x8d00) {
+                regs->pc += SH_PC_8BIT_OFFSET(inst);
+                return 0;
+        }
+
+        if ((inst & 0xe000) == 0xa000) {
+                regs->pc += SH_PC_12BIT_OFFSET(inst);
+                return 0;
+        }
+
+        if ((inst & 0xf0df) == 0x0003) {
+                regs->pc += regs->regs[(inst & 0x0f00) >> 8] + 4;
+                return 0;
+        }
+
+        if ((inst & 0xf0df) == 0x400b) {
+                regs->pc = regs->regs[(inst & 0x0f00) >> 8];
+                return 0;
+        }
+
+        if ((inst & 0xffff) == 0x000b) {
+                regs->pc = regs->pr;
+                return 0;
+        }
+
+        return 1;
+}
+#endif
+
+asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5,
+                                unsigned long r6, unsigned long r7,
+                                struct pt_regs __regs)
+{
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        unsigned long error_code;
+        struct task_struct *tsk = current;
+#ifdef CONFIG_SH_FPU_EMU
+        unsigned short inst = 0;
+
+        get_user(inst, (unsigned short *)regs->pc + 1);
+        if (!do_fpu_inst(inst, regs)) {
+                get_user(inst, (unsigned short *)regs->pc);
+                if (!emulate_branch(inst, regs))
+                        return;
+                /* fault in branch.*/
+        }
+        /* not a FPU inst. */
+#endif
+
+        lookup_exception_vector(error_code);
+
+        local_irq_enable();
+        CHK_REMOTE_DEBUG(regs);
+        force_sig(SIGILL, tsk);
+        die_if_no_fixup("illegal slot instruction", regs, error_code);
+}
+
+asmlinkage void do_exception_error(unsigned long r4, unsigned long r5,
+                                   unsigned long r6, unsigned long r7,
+                                   struct pt_regs __regs)
+{
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        long ex;
+
+        lookup_exception_vector(ex);
+        die_if_kernel("exception", regs, ex);
+}
+
+#if defined(CONFIG_SH_STANDARD_BIOS)
+void *gdb_vbr_vector;
+
+static inline void __init gdb_vbr_init(void)
+{
+        register unsigned long vbr;
+
+        /*
+         * Read the old value of the VBR register to initialise
+         * the vector through which debug and BIOS traps are
+         * delegated by the Linux trap handler.
+         */
+        asm volatile("stc vbr, %0" : "=r" (vbr));
+
+        gdb_vbr_vector = (void *)(vbr + 0x100);
+        printk("Setting GDB trap vector to 0x%08lx\n",
+               (unsigned long)gdb_vbr_vector);
+}
+#endif
+
+void __cpuinit per_cpu_trap_init(void)
+{
+        extern void *vbr_base;
+
+#ifdef CONFIG_SH_STANDARD_BIOS
+        if (raw_smp_processor_id() == 0)
+                gdb_vbr_init();
+#endif
+
+        /* NOTE: The VBR value should be at P1
+           (or P2, virtural "fixed" address space).
+           It's definitely should not in physical address.  */
+
+        asm volatile("ldc       %0, vbr"
+                     : /* no output */
+                     : "r" (&vbr_base)
+                     : "memory");
+}
+
+void *set_exception_table_vec(unsigned int vec, void *handler)
+{
+        extern void *exception_handling_table[];
+        void *old_handler;
+
+        old_handler = exception_handling_table[vec];
+        exception_handling_table[vec] = handler;
+        return old_handler;
+}
+
+void __init trap_init(void)
+{
+        set_exception_table_vec(TRAP_RESERVED_INST, do_reserved_inst);
+        set_exception_table_vec(TRAP_ILLEGAL_SLOT_INST, do_illegal_slot_inst);
+
+#if defined(CONFIG_CPU_SH4) && !defined(CONFIG_SH_FPU) || \
+    defined(CONFIG_SH_FPU_EMU)
+        /*
+         * For SH-4 lacking an FPU, treat floating point instructions as
+         * reserved. They'll be handled in the math-emu case, or faulted on
+         * otherwise.
+         */
+        set_exception_table_evt(0x800, do_reserved_inst);
+        set_exception_table_evt(0x820, do_illegal_slot_inst);
+#elif defined(CONFIG_SH_FPU)
+#ifdef CONFIG_CPU_SUBTYPE_SHX3
+        set_exception_table_evt(0xd80, fpu_state_restore_trap_handler);
+        set_exception_table_evt(0xda0, fpu_state_restore_trap_handler);
+#else
+        set_exception_table_evt(0x800, fpu_state_restore_trap_handler);
+        set_exception_table_evt(0x820, fpu_state_restore_trap_handler);
+#endif
+#endif
+
+#ifdef CONFIG_CPU_SH2
+        set_exception_table_vec(TRAP_ADDRESS_ERROR, address_error_trap_handler);
+#endif
+#ifdef CONFIG_CPU_SH2A
+        set_exception_table_vec(TRAP_DIVZERO_ERROR, do_divide_error);
+        set_exception_table_vec(TRAP_DIVOVF_ERROR, do_divide_error);
+#endif
+
+        /* Setup VBR for boot cpu */
+        per_cpu_trap_init();
+}
+
+void show_trace(struct task_struct *tsk, unsigned long *sp,
+                struct pt_regs *regs)
+{
+        unsigned long addr;
+
+        if (regs && user_mode(regs))
+                return;
+
+        printk("\nCall trace: ");
+#ifdef CONFIG_KALLSYMS
+        printk("\n");
+#endif
+
+        while (!kstack_end(sp)) {
+                addr = *sp++;
+                if (kernel_text_address(addr))
+                        print_ip_sym(addr);
+        }
+
+        printk("\n");
+
+        if (!tsk)
+                tsk = current;
+
+        debug_show_held_locks(tsk);
+}
+
+void show_stack(struct task_struct *tsk, unsigned long *sp)
+{
+        unsigned long stack;
+
+        if (!tsk)
+                tsk = current;
+        if (tsk == current)
+                sp = (unsigned long *)current_stack_pointer;
+        else
+                sp = (unsigned long *)tsk->thread.sp;
+
+        stack = (unsigned long)sp;
+        dump_mem("Stack: ", stack, THREAD_SIZE +
+                 (unsigned long)task_stack_page(tsk));
+        show_trace(tsk, sp, NULL);
+}
+
+void dump_stack(void)
+{
+        show_stack(NULL, NULL);
+}
+EXPORT_SYMBOL(dump_stack);
diff --git a/arch/sh64/kernel/traps.c b/arch/sh/kernel/traps_64.c
index f32df3831f45..c0b3c6f6edb5 100644
--- a/arch/sh64/kernel/traps.c
+++ b/arch/sh/kernel/traps_64.c
@@ -1,19 +1,13 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/traps.c
+ * arch/sh/kernel/traps_64.c
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003, 2004  Paul Mundt
  * Copyright (C) 2003, 2004  Richard Curnow
  *
- */
-
-/*
- * 'Traps.c' handles hardware traps and faults after we have saved some
- * state in 'entry.S'.
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -244,7 +238,6 @@ DO_ERROR(12, SIGILL,  "reserved instruction", reserved_inst, current)
 /* Called with interrupts disabled */
 asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs)
 {
-        PLS();
         show_excp_regs(__FUNCTION__, -1, -1, regs);
         die_if_kernel("exception", regs, ex);
 }
@@ -618,9 +611,9 @@ static int misaligned_fpu_load(struct pt_regs *regs,
                    context switch the registers into memory so they can be
                    indexed by register number. */
                 if (last_task_used_math == current) {
-                        grab_fpu();
-                        fpsave(&current->thread.fpu.hard);
-                        release_fpu();
+                        enable_fpu();
+                        save_fpu(current, regs);
+                        disable_fpu();
                         last_task_used_math = NULL;
                         regs->sr |= SR_FD;
                 }
@@ -691,9 +684,9 @@ static int misaligned_fpu_store(struct pt_regs *regs,
                    context switch the registers into memory so they can be
                    indexed by register number. */
                 if (last_task_used_math == current) {
-                        grab_fpu();
-                        fpsave(&current->thread.fpu.hard);
-                        release_fpu();
+                        enable_fpu();
+                        save_fpu(current, regs);
+                        disable_fpu();
                         last_task_used_math = NULL;
                         regs->sr |= SR_FD;
                 }
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 0956fb3681a3..d7d4991f32af 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -1,138 +1,5 @@
-/*
- * ld script to make SuperH Linux kernel
- * Written by Niibe Yutaka
- */
-#include <asm/thread_info.h>
-#include <asm/cache.h>
-#include <asm-generic/vmlinux.lds.h>
-
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")
+#ifdef CONFIG_SUPERH32
+# include "vmlinux_32.lds.S"
 #else
-OUTPUT_FORMAT("elf32-shbig-linux", "elf32-shbig-linux", "elf32-shbig-linux")
+# include "vmlinux_64.lds.S"
 #endif
-OUTPUT_ARCH(sh)
-ENTRY(_start)
-SECTIONS
-{
-        . = CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET;
-        _text = .;                      /* Text and read-only data */
-
-        .empty_zero_page : {
-                *(.empty_zero_page)
-        } = 0
-
-        .text : {
-                *(.text.head)
-                TEXT_TEXT
-                SCHED_TEXT
-                LOCK_TEXT
-                KPROBES_TEXT
-                *(.fixup)
-                *(.gnu.warning)
-        } = 0x0009
-
-        . = ALIGN(16);          /* Exception table */
-        __start___ex_table = .;
-        __ex_table : { *(__ex_table) }
-        __stop___ex_table = .;
-
-        _etext = .;                     /* End of text section */
-
-        BUG_TABLE
-        NOTES
-        RO_DATA(PAGE_SIZE)
-
-        . = ALIGN(THREAD_SIZE);
-        .data : {                       /* Data */
-                *(.data.init_task)
-
-                . = ALIGN(L1_CACHE_BYTES);
-                *(.data.cacheline_aligned)
-
-                . = ALIGN(L1_CACHE_BYTES);
-                *(.data.read_mostly)
-
-                . = ALIGN(PAGE_SIZE);
-                *(.data.page_aligned)
-
-                __nosave_begin = .;
-                *(.data.nosave)
-                . = ALIGN(PAGE_SIZE);
-                __nosave_end = .;
-
-                DATA_DATA
-                CONSTRUCTORS
-        }
-
-        _edata = .;                     /* End of data section */
-
-        . = ALIGN(PAGE_SIZE);           /* Init code and data */
-        __init_begin = .;
-        _sinittext = .;
-        .init.text : { *(.init.text) }
-        _einittext = .;
-        .init.data : { *(.init.data) }
-
-        . = ALIGN(16);
-        __setup_start = .;
-        .init.setup : { *(.init.setup) }
-        __setup_end = .;
-
-        __initcall_start = .;
-        .initcall.init : {
-                INITCALLS
-        }
-        __initcall_end = .;
-        __con_initcall_start = .;
-        .con_initcall.init : { *(.con_initcall.init) }
-        __con_initcall_end = .;
-
-        SECURITY_INIT
-
-#ifdef CONFIG_BLK_DEV_INITRD
-        . = ALIGN(PAGE_SIZE);
-        __initramfs_start = .;
-        .init.ramfs : { *(.init.ramfs) }
-        __initramfs_end = .;
-#endif
-
-        . = ALIGN(4);
-        __machvec_start = .;
-        .machvec.init : { *(.machvec.init) }
-        __machvec_end = .;
-
-        PERCPU(PAGE_SIZE)
-
-        /*
-         * .exit.text is discarded at runtime, not link time, to deal with
-         * references from __bug_table
-         */
-        .exit.text : { *(.exit.text) }
-        .exit.data : { *(.exit.data) }
-
-        . = ALIGN(PAGE_SIZE);
-        .bss : {
-                __init_end = .;
-                __bss_start = .;                /* BSS */
-                *(.bss.page_aligned)
-                *(.bss)
-                *(COMMON)
-                . = ALIGN(4);
-                _ebss = .;                      /* uClinux MTD sucks */
-                _end = . ;
-        }
-
-        /*
-         * When something in the kernel is NOT compiled as a module, the
-         * module cleanup code and data are put into these segments. Both
-         * can then be thrown away, as cleanup code is never called unless
-         * it's a module.
-         */
-        /DISCARD/ : {
-                *(.exitcall.exit)
-        }
-
-        STABS_DEBUG
-        DWARF_DEBUG
-}
diff --git a/arch/sh/kernel/vmlinux_32.lds.S b/arch/sh/kernel/vmlinux_32.lds.S
new file mode 100644
index 000000000000..d549fac6d3e7
--- /dev/null
+++ b/arch/sh/kernel/vmlinux_32.lds.S
@@ -0,0 +1,152 @@
+/*
+ * ld script to make SuperH Linux kernel
+ * Written by Niibe Yutaka
+ */
+#include <asm/thread_info.h>
+#include <asm/cache.h>
+#include <asm-generic/vmlinux.lds.h>
+
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
+OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")
+#else
+OUTPUT_FORMAT("elf32-shbig-linux", "elf32-shbig-linux", "elf32-shbig-linux")
+#endif
+OUTPUT_ARCH(sh)
+ENTRY(_start)
+SECTIONS
+{
+#ifdef CONFIG_32BIT
+        . = CONFIG_PAGE_OFFSET + CONFIG_ZERO_PAGE_OFFSET;
+#else
+        . = CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET;
+#endif
+
+        _text = .;                      /* Text and read-only data */
+
+        .empty_zero_page : {
+                *(.empty_zero_page)
+        } = 0
+
+        .text : {
+                *(.text.head)
+                TEXT_TEXT
+                SCHED_TEXT
+                LOCK_TEXT
+                KPROBES_TEXT
+                *(.fixup)
+                *(.gnu.warning)
+        } = 0x0009
+
+        . = ALIGN(16);          /* Exception table */
+        __start___ex_table = .;
+        __ex_table : { *(__ex_table) }
+        __stop___ex_table = .;
+
+        _etext = .;                     /* End of text section */
+
+        BUG_TABLE
+        NOTES
+        RO_DATA(PAGE_SIZE)
+
+        /*
+         * Code which must be executed uncached and the associated data
+         */
+        . = ALIGN(PAGE_SIZE);
+        __uncached_start = .;
+        .uncached.text : { *(.uncached.text) }
+        .uncached.data : { *(.uncached.data) }
+        __uncached_end = .;
+
+        . = ALIGN(THREAD_SIZE);
+        .data : {                       /* Data */
+                *(.data.init_task)
+
+                . = ALIGN(L1_CACHE_BYTES);
+                *(.data.cacheline_aligned)
+
+                . = ALIGN(L1_CACHE_BYTES);
+                *(.data.read_mostly)
+
+                . = ALIGN(PAGE_SIZE);
+                *(.data.page_aligned)
+
+                __nosave_begin = .;
+                *(.data.nosave)
+                . = ALIGN(PAGE_SIZE);
+                __nosave_end = .;
+
+                DATA_DATA
+                CONSTRUCTORS
+        }
+
+        _edata = .;                     /* End of data section */
+
+        . = ALIGN(PAGE_SIZE);           /* Init code and data */
+        __init_begin = .;
+        _sinittext = .;
+        .init.text : { *(.init.text) }
+        _einittext = .;
+        .init.data : { *(.init.data) }
+
+        . = ALIGN(16);
+        __setup_start = .;
+        .init.setup : { *(.init.setup) }
+        __setup_end = .;
+
+        __initcall_start = .;
+        .initcall.init : {
+                INITCALLS
+        }
+        __initcall_end = .;
+        __con_initcall_start = .;
+        .con_initcall.init : { *(.con_initcall.init) }
+        __con_initcall_end = .;
+
+        SECURITY_INIT
+
+#ifdef CONFIG_BLK_DEV_INITRD
+        . = ALIGN(PAGE_SIZE);
+        __initramfs_start = .;
+        .init.ramfs : { *(.init.ramfs) }
+        __initramfs_end = .;
+#endif
+
+        . = ALIGN(4);
+        __machvec_start = .;
+        .machvec.init : { *(.machvec.init) }
+        __machvec_end = .;
+
+        PERCPU(PAGE_SIZE)
+
+        /*
+         * .exit.text is discarded at runtime, not link time, to deal with
+         * references from __bug_table
+         */
+        .exit.text : { *(.exit.text) }
+        .exit.data : { *(.exit.data) }
+
+        . = ALIGN(PAGE_SIZE);
+        .bss : {
+                __init_end = .;
+                __bss_start = .;                /* BSS */
+                *(.bss.page_aligned)
+                *(.bss)
+                *(COMMON)
+                . = ALIGN(4);
+                _ebss = .;                      /* uClinux MTD sucks */
+                _end = . ;
+        }
+
+        /*
+         * When something in the kernel is NOT compiled as a module, the
+         * module cleanup code and data are put into these segments. Both
+         * can then be thrown away, as cleanup code is never called unless
+         * it's a module.
+         */
+        /DISCARD/ : {
+                *(.exitcall.exit)
+        }
+
+        STABS_DEBUG
+        DWARF_DEBUG
+}
diff --git a/arch/sh/kernel/vmlinux_64.lds.S b/arch/sh/kernel/vmlinux_64.lds.S
new file mode 100644
index 000000000000..2fd0f7401484
--- /dev/null
+++ b/arch/sh/kernel/vmlinux_64.lds.S
@@ -0,0 +1,164 @@
+/*
+ * ld script to make SH64 Linux kernel
+ *
+ * Copyright (C) 2000, 2001  Paolo Alberelli
+ *
+ * benedict.gaster@superh.com:   2nd May 2002
+ *    Add definition of empty_zero_page to be the first page of kernel image.
+ *
+ * benedict.gaster@superh.com:   3rd May 2002
+ *    Added support for ramdisk, removing statically linked romfs at the
+ *    same time.
+ *
+ * lethal@linux-sh.org:          9th May 2003
+ *    Kill off GLOBAL_NAME() usage and other CDC-isms.
+ *
+ * lethal@linux-sh.org:         19th May 2003
+ *    Remove support for ancient toolchains.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <asm/page.h>
+#include <asm/cache.h>
+#include <asm/thread_info.h>
+
+#define LOAD_OFFSET     CONFIG_PAGE_OFFSET
+#include <asm-generic/vmlinux.lds.h>
+
+OUTPUT_ARCH(sh:sh5)
+
+#define C_PHYS(x) AT (ADDR(x) - LOAD_OFFSET)
+
+ENTRY(__start)
+SECTIONS
+{
+        . = CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START + PAGE_SIZE;
+        _text = .;                      /* Text and read-only data */
+
+        .empty_zero_page : C_PHYS(.empty_zero_page) {
+                *(.empty_zero_page)
+        } = 0
+
+        .text : C_PHYS(.text) {
+                *(.text.head)
+                TEXT_TEXT
+                *(.text64)
+                *(.text..SHmedia32)
+                SCHED_TEXT
+                LOCK_TEXT
+                KPROBES_TEXT
+                *(.fixup)
+                *(.gnu.warning)
+#ifdef CONFIG_LITTLE_ENDIAN
+        } = 0x6ff0fff0
+#else
+        } = 0xf0fff06f
+#endif
+
+        /* We likely want __ex_table to be Cache Line aligned */
+        . = ALIGN(L1_CACHE_BYTES);              /* Exception table */
+        __start___ex_table = .;
+        __ex_table : C_PHYS(__ex_table) { *(__ex_table) }
+        __stop___ex_table = .;
+
+        _etext = .;                     /* End of text section */
+
+        BUG_TABLE
+        NOTES 
+        RO_DATA(PAGE_SIZE)
+
+        . = ALIGN(THREAD_SIZE);
+        .data : C_PHYS(.data) {                 /* Data */
+                *(.data.init_task)
+
+                . = ALIGN(L1_CACHE_BYTES);
+                *(.data.cacheline_aligned)
+
+                . = ALIGN(L1_CACHE_BYTES);
+                *(.data.read_mostly)
+
+                . = ALIGN(PAGE_SIZE);
+                *(.data.page_aligned)
+
+                __nosave_begin = .;
+                *(.data.nosave)
+                . = ALIGN(PAGE_SIZE);
+                __nosave_end = .;
+
+                DATA_DATA
+                CONSTRUCTORS
+        }
+
+        _edata = .;                     /* End of data section */
+
+        . = ALIGN(PAGE_SIZE);           /* Init code and data */
+        __init_begin = .;
+        _sinittext = .;
+        .init.text : C_PHYS(.init.text) { *(.init.text) }
+        _einittext = .;
+        .init.data : C_PHYS(.init.data) { *(.init.data) }
+        . = ALIGN(L1_CACHE_BYTES);      /* Better if Cache Line aligned */
+        __setup_start = .;
+        .init.setup : C_PHYS(.init.setup) { *(.init.setup) }
+        __setup_end = .;
+        __initcall_start = .;
+        .initcall.init : C_PHYS(.initcall.init) {
+                INITCALLS
+        }
+        __initcall_end = .;
+        __con_initcall_start = .;
+        .con_initcall.init : C_PHYS(.con_initcall.init) {
+                *(.con_initcall.init)
+        }
+        __con_initcall_end = .;
+
+        SECURITY_INIT
+
+#ifdef CONFIG_BLK_DEV_INITRD
+        . = ALIGN(PAGE_SIZE);
+        __initramfs_start = .;
+        .init.ramfs : C_PHYS(.init.ramfs) { *(.init.ramfs) }
+        __initramfs_end = .;
+#endif
+
+        . = ALIGN(8);
+        __machvec_start = .;
+        .machvec.init : C_PHYS(.machvec.init) { *(.machvec.init) }
+        __machvec_end = .;
+
+        PERCPU(PAGE_SIZE)
+
+        /*
+         * .exit.text is discarded at runtime, not link time, to deal with
+         * references from __bug_table
+         */
+        .exit.text : C_PHYS(.exit.text) { *(.exit.text) }
+        .exit.data : C_PHYS(.exit.data) { *(.exit.data) }
+
+        . = ALIGN(PAGE_SIZE);
+        .bss : C_PHYS(.bss) {
+                __init_end = .;
+                __bss_start = .;                /* BSS */
+                *(.bss.page_aligned)
+                *(.bss)
+                *(COMMON)
+                . = ALIGN(4);
+                _ebss = .;                      /* uClinux MTD sucks */
+                _end = . ;
+        }
+
+        /*
+         * When something in the kernel is NOT compiled as a module, the
+         * module cleanup code and data are put into these segments. Both
+         * can then be thrown away, as cleanup code is never called unless
+         * it's a module.
+         */
+        /DISCARD/ : {
+                *(.exitcall.exit)
+        }
+
+        STABS_DEBUG
+        DWARF_DEBUG
+}
diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index 9dc7b6985052..ebb55d1149f5 100644
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -2,12 +2,13 @@
 # Makefile for SuperH-specific library files..
 #
 
-lib-y  = delay.o memset.o memmove.o memchr.o \
+lib-y  = delay.o io.o memset.o memmove.o memchr.o \
          checksum.o strlen.o div64.o div64-generic.o
 
 memcpy-y                        := memcpy.o
 memcpy-$(CONFIG_CPU_SH4)        := memcpy-sh4.o
 
-lib-y   += $(memcpy-y)
+lib-$(CONFIG_MMU)               += copy_page.o clear_page.o
+lib-y                           += $(memcpy-y)
 
 EXTRA_CFLAGS += -Werror
diff --git a/arch/sh/mm/clear_page.S b/arch/sh/lib/clear_page.S
index 7a7c81ee3f01..3539123fe517 100644
--- a/arch/sh/mm/clear_page.S
+++ b/arch/sh/lib/clear_page.S
@@ -9,10 +9,10 @@
 #include <asm/page.h>
 
 /*
- * clear_page_slow
+ * clear_page
  * @to: P1 address
  *
- * void clear_page_slow(void *to)
+ * void clear_page(void *to)
  */
 
 /*
@@ -20,7 +20,7 @@
  * r4 --- to
  * r5 --- to + PAGE_SIZE
  */
-ENTRY(clear_page_slow)
+ENTRY(clear_page)
         mov     r4,r5
         mov.l   .Llimit,r0
         add     r0,r5
@@ -50,6 +50,8 @@ ENTRY(clear_page_slow)
         !
         rts
          nop
+
+        .balign 4
 .Llimit:        .long   (PAGE_SIZE-28)
 
 ENTRY(__clear_user)
diff --git a/arch/sh/mm/copy_page.S b/arch/sh/lib/copy_page.S
index 40685018b952..e002b91c8752 100644
--- a/arch/sh/mm/copy_page.S
+++ b/arch/sh/lib/copy_page.S
@@ -9,11 +9,11 @@
 #include <asm/page.h>
 
 /*
- * copy_page_slow
+ * copy_page
  * @to: P1 address
  * @from: P1 address
  *
- * void copy_page_slow(void *to, void *from)
+ * void copy_page(void *to, void *from)
  */
 
 /*
@@ -23,7 +23,7 @@
  * r10 --- to
  * r11 --- from
  */
-ENTRY(copy_page_slow)
+ENTRY(copy_page)
         mov.l   r8,@-r15
         mov.l   r10,@-r15
         mov.l   r11,@-r15
@@ -68,8 +68,9 @@ ENTRY(copy_page_slow)
         rts
          nop
 
-        .align 2
+        .balign 4
 .Lpsz:  .long   PAGE_SIZE
+
 /*
  * __kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n);
  * Return the number of bytes NOT copied
diff --git a/arch/sh/lib/io.c b/arch/sh/lib/io.c
new file mode 100644
index 000000000000..4f54ec43516f
--- /dev/null
+++ b/arch/sh/lib/io.c
@@ -0,0 +1,82 @@
+/*
+ * arch/sh/lib/io.c - SH32 optimized I/O routines
+ *
+ * Copyright (C) 2000  Stuart Menefy
+ * Copyright (C) 2005  Paul Mundt
+ *
+ * Provide real functions which expand to whatever the header file defined.
+ * Also definitions of machine independent IO functions.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/module.h>
+#include <linux/io.h>
+
+void __raw_readsl(unsigned long addr, void *datap, int len)
+{
+        u32 *data;
+
+        for (data = datap; (len != 0) && (((u32)data & 0x1f) != 0); len--)
+                *data++ = ctrl_inl(addr);
+
+        if (likely(len >= (0x20 >> 2))) {
+                int tmp2, tmp3, tmp4, tmp5, tmp6;
+
+                __asm__ __volatile__(
+                        "1:                     \n\t"
+                        "mov.l  @%7, r0         \n\t"
+                        "mov.l  @%7, %2         \n\t"
+#ifdef CONFIG_CPU_SH4
+                        "movca.l r0, @%0        \n\t"
+#else
+                        "mov.l  r0, @%0         \n\t"
+#endif
+                        "mov.l  @%7, %3         \n\t"
+                        "mov.l  @%7, %4         \n\t"
+                        "mov.l  @%7, %5         \n\t"
+                        "mov.l  @%7, %6         \n\t"
+                        "mov.l  @%7, r7         \n\t"
+                        "mov.l  @%7, r0         \n\t"
+                        "mov.l  %2, @(0x04,%0)  \n\t"
+                        "mov    #0x20>>2, %2    \n\t"
+                        "mov.l  %3, @(0x08,%0)  \n\t"
+                        "sub    %2, %1          \n\t"
+                        "mov.l  %4, @(0x0c,%0)  \n\t"
+                        "cmp/hi %1, %2          ! T if 32 > len \n\t"
+                        "mov.l  %5, @(0x10,%0)  \n\t"
+                        "mov.l  %6, @(0x14,%0)  \n\t"
+                        "mov.l  r7, @(0x18,%0)  \n\t"
+                        "mov.l  r0, @(0x1c,%0)  \n\t"
+                        "bf.s   1b              \n\t"
+                        " add   #0x20, %0       \n\t"
+                        : "=&r" (data), "=&r" (len),
+                          "=&r" (tmp2), "=&r" (tmp3), "=&r" (tmp4),
+                          "=&r" (tmp5), "=&r" (tmp6)
+                        : "r"(addr), "0" (data), "1" (len)
+                        : "r0", "r7", "t", "memory");
+        }
+
+        for (; len != 0; len--)
+                *data++ = ctrl_inl(addr);
+}
+EXPORT_SYMBOL(__raw_readsl);
+
+void __raw_writesl(unsigned long addr, const void *data, int len)
+{
+        if (likely(len != 0)) {
+                int tmp1;
+
+                __asm__ __volatile__ (
+                        "1:                             \n\t"
+                        "mov.l  @%0+, %1        \n\t"
+                        "dt             %3              \n\t"
+                        "bf.s           1b              \n\t"
+                        " mov.l %1, @%4         \n\t"
+                        : "=&r" (data), "=&r" (tmp1)
+                        : "0" (data), "r" (len), "r"(addr)
+                        : "t", "memory");
+        }
+}
+EXPORT_SYMBOL(__raw_writesl);
diff --git a/arch/sh64/lib/.gitignore b/arch/sh/lib64/.gitignore
index 3508c2cb23c4..3508c2cb23c4 100644
--- a/arch/sh64/lib/.gitignore
+++ b/arch/sh/lib64/.gitignore
diff --git a/arch/sh/lib64/Makefile b/arch/sh/lib64/Makefile
new file mode 100644
index 000000000000..9950966923a0
--- /dev/null
+++ b/arch/sh/lib64/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for the SH-5 specific library files..
+#
+# Copyright (C) 2000, 2001  Paolo Alberelli
+# Copyright (C) 2003  Paul Mundt
+#
+# This file is subject to the terms and conditions of the GNU General Public
+# License.  See the file "COPYING" in the main directory of this archive
+# for more details.
+#
+
+# Panic should really be compiled as PIC
+lib-y  := udelay.o c-checksum.o dbg.o panic.o memcpy.o copy_user_memcpy.o \
+                copy_page.o clear_page.o
+
diff --git a/arch/sh64/lib/c-checksum.c b/arch/sh/lib64/c-checksum.c
index 053137abd8a0..5dfbd8b5e558 100644
--- a/arch/sh64/lib/c-checksum.c
+++ b/arch/sh/lib64/c-checksum.c
@@ -1,12 +1,9 @@
 /*
- * arch/sh64/lib/c-checksum.c
+ * arch/sh/lib64/c-checksum.c
  *
  * This file contains network checksum routines that are better done
  * in an architecture-specific manner due to speed..
  */
-
-#undef DEBUG
-
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/arch/sh64/lib/page_clear.S b/arch/sh/lib64/clear_page.S
index ac0111d669a3..007ab48ecc1c 100644
--- a/arch/sh64/lib/page_clear.S
+++ b/arch/sh/lib64/clear_page.S
@@ -25,8 +25,8 @@
         .little
 
         .balign 8
-        .global sh64_page_clear
-sh64_page_clear:
+        .global clear_page
+clear_page:
         pta/l 1f, tr1
         pta/l 2f, tr2
         ptabs/l r18, tr0
diff --git a/arch/sh64/lib/page_copy.S b/arch/sh/lib64/copy_page.S
index e159c3cd2582..0ec6fca63b56 100644
--- a/arch/sh64/lib/page_copy.S
+++ b/arch/sh/lib64/copy_page.S
@@ -10,8 +10,8 @@
    of SH5-101 cut2 eval chip with Cayman board DDR memory.
 
    Parameters:
-   r2 : source effective address (start of page)
-   r3 : destination effective address (start of page)
+   r2 : destination effective address (start of page)
+   r3 : source effective address (start of page)
 
    Always copies 4096 bytes.
 
@@ -27,10 +27,10 @@
         .little
 
         .balign 8
-        .global sh64_page_copy
-sh64_page_copy:
+        .global copy_page
+copy_page:
 
-        /* Copy 4096 bytes worth of data from r2 to r3.
+        /* Copy 4096 bytes worth of data from r3 to r2.
            Do prefetches 4 lines ahead.
            Do alloco 2 lines ahead */
 
@@ -41,21 +41,21 @@ sh64_page_copy:
 
 #if 0
         /* TAKum03020 */
-        ld.q r2, 0x00, r63
-        ld.q r2, 0x20, r63
-        ld.q r2, 0x40, r63
-        ld.q r2, 0x60, r63
+        ld.q r3, 0x00, r63
+        ld.q r3, 0x20, r63
+        ld.q r3, 0x40, r63
+        ld.q r3, 0x60, r63
 #endif
-        alloco r3, 0x00
+        alloco r2, 0x00
         synco           ! TAKum03020
-        alloco r3, 0x20
+        alloco r2, 0x20
         synco           ! TAKum03020
 
         movi 3968, r6
-        add  r3, r6, r6
+        add  r2, r6, r6
         addi r6, 64, r7
         addi r7, 64, r8
-        sub r2, r3, r60
+        sub r3, r2, r60
         addi r60, 8, r61
         addi r61, 8, r62
         addi r62, 8, r23
@@ -67,25 +67,23 @@ sh64_page_copy:
 1:
 #if 0
         /* TAKum03020 */
-        bge/u r3, r6, tr2  ! skip prefetch for last 4 lines
-        ldx.q r3, r22, r63 ! prefetch 4 lines hence
+        bge/u r2, r6, tr2  ! skip prefetch for last 4 lines
+        ldx.q r2, r22, r63 ! prefetch 4 lines hence
 #endif
 2:
-        bge/u r3, r7, tr3  ! skip alloco for last 2 lines
-        alloco r3, 0x40    ! alloc destination line 2 lines ahead
+        bge/u r2, r7, tr3  ! skip alloco for last 2 lines
+        alloco r2, 0x40    ! alloc destination line 2 lines ahead
         synco           ! TAKum03020
 3:
-        ldx.q r3, r60, r36
-        ldx.q r3, r61, r37
-        ldx.q r3, r62, r38
-        ldx.q r3, r23, r39
-        st.q  r3,   0, r36
-        st.q  r3,   8, r37
-        st.q  r3,  16, r38
-        st.q  r3,  24, r39
-        addi r3, 32, r3
-        bgt/l r8, r3, tr1
+        ldx.q r2, r60, r36
+        ldx.q r2, r61, r37
+        ldx.q r2, r62, r38
+        ldx.q r2, r23, r39
+        st.q  r2,   0, r36
+        st.q  r2,   8, r37
+        st.q  r2,  16, r38
+        st.q  r2,  24, r39
+        addi r2, 32, r2
+        bgt/l r8, r2, tr1
 
         blink tr0, r63     ! return
-
-
diff --git a/arch/sh64/lib/copy_user_memcpy.S b/arch/sh/lib64/copy_user_memcpy.S
index 2a62816d2ddd..2a62816d2ddd 100644
--- a/arch/sh64/lib/copy_user_memcpy.S
+++ b/arch/sh/lib64/copy_user_memcpy.S
diff --git a/arch/sh64/lib/dbg.c b/arch/sh/lib64/dbg.c
index 97816e0baf19..75825ef6e084 100644
--- a/arch/sh64/lib/dbg.c
+++ b/arch/sh/lib64/dbg.c
@@ -2,7 +2,7 @@
 --
 -- Identity : Linux50 Debug Funcions
 --
--- File     : arch/sh64/lib/dbg.C
+-- File     : arch/sh/lib64/dbg.c
 --
 -- Copyright 2000, 2001 STMicroelectronics Limited.
 -- Copyright 2004 Richard Curnow (evt_debug etc)
diff --git a/arch/sh64/lib/memcpy.c b/arch/sh/lib64/memcpy.c
index fba436a92bfa..fba436a92bfa 100644
--- a/arch/sh64/lib/memcpy.c
+++ b/arch/sh/lib64/memcpy.c
diff --git a/arch/sh64/lib/panic.c b/arch/sh/lib64/panic.c
index c9eb1cb50d97..ff559e2a96f7 100644
--- a/arch/sh64/lib/panic.c
+++ b/arch/sh/lib64/panic.c
@@ -8,7 +8,7 @@
 
 #include <linux/kernel.h>
 #include <asm/io.h>
-#include <asm/registers.h>
+#include <asm/cpu/registers.h>
 
 /* THIS IS A PHYSICAL ADDRESS */
 #define HDSP2534_ADDR (0x04002100)
diff --git a/arch/sh64/lib/udelay.c b/arch/sh/lib64/udelay.c
index 327653914007..23c7d17fb9f7 100644
--- a/arch/sh64/lib/udelay.c
+++ b/arch/sh/lib64/udelay.c
@@ -1,5 +1,5 @@
 /*
- * arch/sh64/lib/udelay.c
+ * arch/sh/lib64/udelay.c
  *
  * Delay routines, using a pre-computed "loops_per_jiffy" value.
  *
@@ -13,8 +13,6 @@
 #include <linux/sched.h>
 #include <asm/param.h>
 
-extern unsigned long loops_per_jiffy;
-
 /*
  * Use only for very small delays (< 1 msec).
  *
@@ -49,11 +47,10 @@ void __ndelay(unsigned long long nsecs, unsigned long lpj)
 
 void udelay(unsigned long usecs)
 {
-        __udelay(usecs, loops_per_jiffy);
+        __udelay(usecs, cpu_data[raw_smp_processor_id()].loops_per_jiffy);
 }
 
 void ndelay(unsigned long nsecs)
 {
-        __ndelay(nsecs, loops_per_jiffy);
+        __ndelay(nsecs, cpu_data[raw_smp_processor_id()].loops_per_jiffy);
 }
-
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 1265f204f7d1..f549b8cd2501 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -1,193 +1,3 @@
-#
-# Processor families
-#
-config CPU_SH2
-        bool
-
-config CPU_SH2A
-        bool
-        select CPU_SH2
-
-config CPU_SH3
-        bool
-        select CPU_HAS_INTEVT
-        select CPU_HAS_SR_RB
-
-config CPU_SH4
-        bool
-        select CPU_HAS_INTEVT
-        select CPU_HAS_SR_RB
-        select CPU_HAS_PTEA if !CPU_SH4A || CPU_SHX2
-        select CPU_HAS_FPU if !CPU_SH4AL_DSP
-
-config CPU_SH4A
-        bool
-        select CPU_SH4
-
-config CPU_SH4AL_DSP
-        bool
-        select CPU_SH4A
-        select CPU_HAS_DSP
-
-config CPU_SHX2
-        bool
-
-config CPU_SHX3
-        bool
-
-choice
-        prompt "Processor sub-type selection"
-
-#
-# Processor subtypes
-#
-
-# SH-2 Processor Support
-
-config CPU_SUBTYPE_SH7619
-        bool "Support SH7619 processor"
-        select CPU_SH2
-
-# SH-2A Processor Support
-
-config CPU_SUBTYPE_SH7206
-        bool "Support SH7206 processor"
-        select CPU_SH2A
-
-# SH-3 Processor Support
-
-config CPU_SUBTYPE_SH7705
-        bool "Support SH7705 processor"
-        select CPU_SH3
-
-config CPU_SUBTYPE_SH7706
-        bool "Support SH7706 processor"
-        select CPU_SH3
-        help
-          Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU.
-
-config CPU_SUBTYPE_SH7707
-        bool "Support SH7707 processor"
-        select CPU_SH3
-        help
-          Select SH7707 if you have a  60 Mhz SH-3 HD6417707 CPU.
-
-config CPU_SUBTYPE_SH7708
-        bool "Support SH7708 processor"
-        select CPU_SH3
-        help
-          Select SH7708 if you have a  60 Mhz SH-3 HD6417708S or
-          if you have a 100 Mhz SH-3 HD6417708R CPU.
-
-config CPU_SUBTYPE_SH7709
-        bool "Support SH7709 processor"
-        select CPU_SH3
-        help
-          Select SH7709 if you have a  80 Mhz SH-3 HD6417709 CPU.
-
-config CPU_SUBTYPE_SH7710
-        bool "Support SH7710 processor"
-        select CPU_SH3
-        select CPU_HAS_DSP
-        help
-          Select SH7710 if you have a SH3-DSP SH7710 CPU.
-
-config CPU_SUBTYPE_SH7712
-        bool "Support SH7712 processor"
-        select CPU_SH3
-        select CPU_HAS_DSP
-        help
-          Select SH7712 if you have a SH3-DSP SH7712 CPU.
-
-config CPU_SUBTYPE_SH7720
-        bool "Support SH7720 processor"
-        select CPU_SH3
-        select CPU_HAS_DSP
-        help
-          Select SH7720 if you have a SH3-DSP SH7720 CPU.
-
-# SH-4 Processor Support
-
-config CPU_SUBTYPE_SH7750
-        bool "Support SH7750 processor"
-        select CPU_SH4
-        help
-          Select SH7750 if you have a 200 Mhz SH-4 HD6417750 CPU.
-
-config CPU_SUBTYPE_SH7091
-        bool "Support SH7091 processor"
-        select CPU_SH4
-        help
-          Select SH7091 if you have an SH-4 based Sega device (such as
-          the Dreamcast, Naomi, and Naomi 2).
-
-config CPU_SUBTYPE_SH7750R
-        bool "Support SH7750R processor"
-        select CPU_SH4
-
-config CPU_SUBTYPE_SH7750S
-        bool "Support SH7750S processor"
-        select CPU_SH4
-
-config CPU_SUBTYPE_SH7751
-        bool "Support SH7751 processor"
-        select CPU_SH4
-        help
-          Select SH7751 if you have a 166 Mhz SH-4 HD6417751 CPU,
-          or if you have a HD6417751R CPU.
-
-config CPU_SUBTYPE_SH7751R
-        bool "Support SH7751R processor"
-        select CPU_SH4
-
-config CPU_SUBTYPE_SH7760
-        bool "Support SH7760 processor"
-        select CPU_SH4
-
-config CPU_SUBTYPE_SH4_202
-        bool "Support SH4-202 processor"
-        select CPU_SH4
-
-# SH-4A Processor Support
-
-config CPU_SUBTYPE_SH7770
-        bool "Support SH7770 processor"
-        select CPU_SH4A
-
-config CPU_SUBTYPE_SH7780
-        bool "Support SH7780 processor"
-        select CPU_SH4A
-
-config CPU_SUBTYPE_SH7785
-        bool "Support SH7785 processor"
-        select CPU_SH4A
-        select CPU_SHX2
-        select ARCH_SPARSEMEM_ENABLE
-        select SYS_SUPPORTS_NUMA
-
-config CPU_SUBTYPE_SHX3
-        bool "Support SH-X3 processor"
-        select CPU_SH4A
-        select CPU_SHX3
-        select ARCH_SPARSEMEM_ENABLE
-        select SYS_SUPPORTS_NUMA
-        select SYS_SUPPORTS_SMP
-
-# SH4AL-DSP Processor Support
-
-config CPU_SUBTYPE_SH7343
-        bool "Support SH7343 processor"
-        select CPU_SH4AL_DSP
-
-config CPU_SUBTYPE_SH7722
-        bool "Support SH7722 processor"
-        select CPU_SH4AL_DSP
-        select CPU_SHX2
-        select ARCH_SPARSEMEM_ENABLE
-        select SYS_SUPPORTS_NUMA
-
-endchoice
-
 menu "Memory management options"
 
 config QUICKLIST
@@ -207,7 +17,8 @@ config MMU
 
 config PAGE_OFFSET
         hex
-        default "0x80000000" if MMU
+        default "0x80000000" if MMU && SUPERH32
+        default "0x20000000" if MMU && SUPERH64
         default "0x00000000"
 
 config MEMORY_START
@@ -228,17 +39,28 @@ config MEMORY_START
 
 config MEMORY_SIZE
         hex "Physical memory size"
-        default "0x00400000"
+        default "0x04000000"
         help
           This sets the default memory size assumed by your SH kernel. It can
           be overridden as normal by the 'mem=' argument on the kernel command
           line. If unsure, consult your board specifications or just leave it
-          as 0x00400000 which was the default value before this became
+          as 0x04000000 which was the default value before this became
           configurable.
 
+# Physical addressing modes
+
+config 29BIT
+        def_bool !32BIT
+        depends on SUPERH32
+
 config 32BIT
+        bool
+        default y if CPU_SH5
+
+config PMB
         bool "Support 32-bit physical addressing through PMB"
         depends on MMU && (CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785)
+        select 32BIT
         default y
         help
           If you say Y here, physical addressing will be extended to
@@ -256,7 +78,7 @@ config X2TLB
 
 config VSYSCALL
         bool "Support vsyscall page"
-        depends on MMU
+        depends on MMU && (CPU_SH3 || CPU_SH4)
         default y
         help
           This will enable support for the kernel mapping a vDSO page
@@ -335,7 +157,7 @@ config PAGE_SIZE_8KB
 
 config PAGE_SIZE_64KB
         bool "64kB"
-        depends on CPU_SH4
+        depends on CPU_SH4 || CPU_SH5
         help
           This enables support for 64kB pages, possible on all SH-4
           CPUs and later.
@@ -344,7 +166,7 @@ endchoice
 
 choice
         prompt "HugeTLB page size"
-        depends on HUGETLB_PAGE && CPU_SH4 && MMU
+        depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU
         default HUGETLB_PAGE_SIZE_64K
 
 config HUGETLB_PAGE_SIZE_64K
@@ -365,6 +187,10 @@ config HUGETLB_PAGE_SIZE_64MB
         bool "64MB"
         depends on X2TLB
 
+config HUGETLB_PAGE_SIZE_512MB
+        bool "512MB"
+        depends on CPU_SH5
+
 endchoice
 
 source "mm/Kconfig"
@@ -392,12 +218,12 @@ config SH_DIRECT_MAPPED
 
 choice
         prompt "Cache mode"
-        default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4
+        default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5
         default CACHE_WRITETHROUGH if (CPU_SH2 && !CPU_SH2A)
 
 config CACHE_WRITEBACK
         bool "Write-back"
-        depends on CPU_SH2A || CPU_SH3 || CPU_SH4
+        depends on CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5
 
 config CACHE_WRITETHROUGH
         bool "Write-through"
diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile
index aa44607f072d..9f4bc3d90b1e 100644
--- a/arch/sh/mm/Makefile
+++ b/arch/sh/mm/Makefile
@@ -1,37 +1,5 @@
-#
-# Makefile for the Linux SuperH-specific parts of the memory manager.
-#
-
-obj-y                   := init.o extable.o consistent.o
-
-ifndef CONFIG_CACHE_OFF
-obj-$(CONFIG_CPU_SH2)           += cache-sh2.o
-obj-$(CONFIG_CPU_SH3)           += cache-sh3.o
-obj-$(CONFIG_CPU_SH4)           += cache-sh4.o
-obj-$(CONFIG_SH7705_CACHE_32KB) += cache-sh7705.o
+ifeq ($(CONFIG_SUPERH32),y)
+include ${srctree}/arch/sh/mm/Makefile_32
+else
+include ${srctree}/arch/sh/mm/Makefile_64
 endif
-
-mmu-y                   := tlb-nommu.o pg-nommu.o
-mmu-$(CONFIG_MMU)       := fault.o clear_page.o copy_page.o tlb-flush.o \
-                           ioremap.o
-
-obj-y                   += $(mmu-y)
-
-ifdef CONFIG_DEBUG_FS
-obj-$(CONFIG_CPU_SH4)   += cache-debugfs.o
-endif
-
-ifdef CONFIG_MMU
-obj-$(CONFIG_CPU_SH3)   += tlb-sh3.o
-obj-$(CONFIG_CPU_SH4)   += tlb-sh4.o
-ifndef CONFIG_CACHE_OFF
-obj-$(CONFIG_CPU_SH4)           += pg-sh4.o
-obj-$(CONFIG_SH7705_CACHE_32KB) += pg-sh7705.o
-endif
-endif
-
-obj-$(CONFIG_HUGETLB_PAGE)      += hugetlbpage.o
-obj-$(CONFIG_32BIT)             += pmb.o
-obj-$(CONFIG_NUMA)              += numa.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/sh/mm/Makefile_32 b/arch/sh/mm/Makefile_32
new file mode 100644
index 000000000000..e295db60b91b
--- /dev/null
+++ b/arch/sh/mm/Makefile_32
@@ -0,0 +1,36 @@
+#
+# Makefile for the Linux SuperH-specific parts of the memory manager.
+#
+
+obj-y                   := init.o extable_32.o consistent.o
+
+ifndef CONFIG_CACHE_OFF
+obj-$(CONFIG_CPU_SH2)           += cache-sh2.o
+obj-$(CONFIG_CPU_SH3)           += cache-sh3.o
+obj-$(CONFIG_CPU_SH4)           += cache-sh4.o
+obj-$(CONFIG_SH7705_CACHE_32KB) += cache-sh7705.o
+endif
+
+mmu-y                   := tlb-nommu.o pg-nommu.o
+mmu-$(CONFIG_MMU)       := fault_32.o tlbflush_32.o ioremap_32.o
+
+obj-y                   += $(mmu-y)
+
+ifdef CONFIG_DEBUG_FS
+obj-$(CONFIG_CPU_SH4)   += cache-debugfs.o
+endif
+
+ifdef CONFIG_MMU
+obj-$(CONFIG_CPU_SH3)   += tlb-sh3.o
+obj-$(CONFIG_CPU_SH4)   += tlb-sh4.o
+ifndef CONFIG_CACHE_OFF
+obj-$(CONFIG_CPU_SH4)           += pg-sh4.o
+obj-$(CONFIG_SH7705_CACHE_32KB) += pg-sh7705.o
+endif
+endif
+
+obj-$(CONFIG_HUGETLB_PAGE)      += hugetlbpage.o
+obj-$(CONFIG_PMB)               += pmb.o
+obj-$(CONFIG_NUMA)              += numa.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/sh64/mm/Makefile b/arch/sh/mm/Makefile_64
index d0e813632480..cbd6aa33c5ac 100644
--- a/arch/sh64/mm/Makefile
+++ b/arch/sh/mm/Makefile_64
@@ -1,24 +1,24 @@
 #
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 2000, 2001  Paolo Alberelli
-# Copyright (C) 2003, 2004  Paul Mundt
-#
-# Makefile for the sh64-specific parts of the Linux memory manager.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
+# Makefile for the Linux SuperH-specific parts of the memory manager.
 #
 
-obj-y := cache.o consistent.o extable.o fault.o init.o ioremap.o \
-         tlbmiss.o tlb.o
+obj-y                   := init.o extable_64.o consistent.o
+
+mmu-y                   := tlb-nommu.o pg-nommu.o
+mmu-$(CONFIG_MMU)       := fault_64.o ioremap_64.o tlbflush_64.o tlb-sh5.o
+
+ifndef CONFIG_CACHE_OFF
+obj-y                   += cache-sh5.o
+endif
+
+obj-y                   += $(mmu-y)
 
 obj-$(CONFIG_HUGETLB_PAGE)      += hugetlbpage.o
+obj-$(CONFIG_NUMA)              += numa.o
+
+EXTRA_CFLAGS += -Werror
 
-# Special flags for tlbmiss.o.  This puts restrictions on the number of
+# Special flags for fault_64.o.  This puts restrictions on the number of
 # caller-save registers that the compiler can target when building this file.
 # This is required because the code is called from a context in entry.S where
 # very few registers have been saved in the exception handler (for speed
@@ -33,7 +33,7 @@ obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o
 # The resources not listed below are callee save, i.e. the compiler is free to
 # use any of them and will spill them to the stack itself.
 
-CFLAGS_tlbmiss.o += -ffixed-r7 \
+CFLAGS_fault_64.o += -ffixed-r7 \
         -ffixed-r8 -ffixed-r9 -ffixed-r10 -ffixed-r11 -ffixed-r12 \
         -ffixed-r13 -ffixed-r14 -ffixed-r16 -ffixed-r17 -ffixed-r19 \
         -ffixed-r20 -ffixed-r21 -ffixed-r22 -ffixed-r23 \
diff --git a/arch/sh/mm/cache-debugfs.c b/arch/sh/mm/cache-debugfs.c
index de6d2c9aa477..db6d950b6f5e 100644
--- a/arch/sh/mm/cache-debugfs.c
+++ b/arch/sh/mm/cache-debugfs.c
@@ -22,7 +22,8 @@ enum cache_type {
         CACHE_TYPE_UNIFIED,
 };
 
-static int cache_seq_show(struct seq_file *file, void *iter)
+static int __uses_jump_to_uncached cache_seq_show(struct seq_file *file,
+                                                  void *iter)
 {
         unsigned int cache_type = (unsigned int)file->private;
         struct cache_info *cache;
@@ -34,11 +35,11 @@ static int cache_seq_show(struct seq_file *file, void *iter)
          * Go uncached immediately so we don't skew the results any
          * more than we already are..
          */
-        jump_to_P2();
+        jump_to_uncached();
 
         ccr = ctrl_inl(CCR);
         if ((ccr & CCR_CACHE_ENABLE) == 0) {
-                back_to_P1();
+                back_to_cached();
 
                 seq_printf(file, "disabled\n");
                 return 0;
@@ -104,7 +105,7 @@ static int cache_seq_show(struct seq_file *file, void *iter)
                 addrstart += cache->way_incr;
         }
 
-        back_to_P1();
+        back_to_cached();
 
         return 0;
 }
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index 226b190c5b9c..43d7ff6b6ec7 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -190,7 +190,7 @@ void flush_icache_range(unsigned long start, unsigned long end)
  * .. which happens to be the same behavior as flush_icache_range().
  * So, we simply flush out a line.
  */
-void flush_cache_sigtramp(unsigned long addr)
+void __uses_jump_to_uncached flush_cache_sigtramp(unsigned long addr)
 {
         unsigned long v, index;
         unsigned long flags;
@@ -205,13 +205,13 @@ void flush_cache_sigtramp(unsigned long addr)
                         (v & boot_cpu_data.icache.entry_mask);
 
         local_irq_save(flags);
-        jump_to_P2();
+        jump_to_uncached();
 
         for (i = 0; i < boot_cpu_data.icache.ways;
              i++, index += boot_cpu_data.icache.way_incr)
                 ctrl_outl(0, index);    /* Clear out Valid-bit */
 
-        back_to_P1();
+        back_to_cached();
         wmb();
         local_irq_restore(flags);
 }
@@ -256,12 +256,12 @@ void flush_dcache_page(struct page *page)
 }
 
 /* TODO: Selective icache invalidation through IC address array.. */
-static inline void flush_icache_all(void)
+static inline void __uses_jump_to_uncached flush_icache_all(void)
 {
         unsigned long flags, ccr;
 
         local_irq_save(flags);
-        jump_to_P2();
+        jump_to_uncached();
 
         /* Flush I-cache */
         ccr = ctrl_inl(CCR);
@@ -269,11 +269,11 @@ static inline void flush_icache_all(void)
         ctrl_outl(ccr, CCR);
 
         /*
-         * back_to_P1() will take care of the barrier for us, don't add
+         * back_to_cached() will take care of the barrier for us, don't add
          * another one!
          */
 
-        back_to_P1();
+        back_to_cached();
         local_irq_restore(flags);
 }
 
diff --git a/arch/sh64/mm/cache.c b/arch/sh/mm/cache-sh5.c
index 421487cfff4c..4617e3aeee73 100644
--- a/arch/sh64/mm/cache.c
+++ b/arch/sh/mm/cache-sh5.c
@@ -1,18 +1,15 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/mm/cache.c
+ * arch/sh/mm/cache-sh5.c
  *
  * Original version Copyright (C) 2000, 2001  Paolo Alberelli
  * Second version Copyright (C) benedict.gaster@superh.com 2002
  * Third version Copyright Richard.Curnow@superh.com 2003
  * Hacks to third version Copyright (C) 2003 Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
-/****************************************************************************/
-
 #include <linux/init.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
@@ -146,7 +143,7 @@ int __init sh64_cache_init(void)
 /* The following group of functions deal with mapping and unmapping a temporary
    page into the DTLB slot that have been set aside for our exclusive use. */
 /* In order to accomplish this, we use the generic interface for adding and
-   removing a wired slot entry as defined in arch/sh64/mm/tlb.c */
+   removing a wired slot entry as defined in arch/sh/mm/tlb-sh5.c */
 /****************************************************************************/
 
 static unsigned long slot_own_flags;
diff --git a/arch/sh/mm/cache-sh7705.c b/arch/sh/mm/cache-sh7705.c
index 4896d7376926..22dacc778823 100644
--- a/arch/sh/mm/cache-sh7705.c
+++ b/arch/sh/mm/cache-sh7705.c
@@ -71,7 +71,7 @@ void flush_icache_range(unsigned long start, unsigned long end)
 /*
  * Writeback&Invalidate the D-cache of the page
  */
-static void __flush_dcache_page(unsigned long phys)
+static void __uses_jump_to_uncached __flush_dcache_page(unsigned long phys)
 {
         unsigned long ways, waysize, addrstart;
         unsigned long flags;
@@ -92,7 +92,7 @@ static void __flush_dcache_page(unsigned long phys)
          * possible.
          */
         local_irq_save(flags);
-        jump_to_P2();
+        jump_to_uncached();
 
         ways = current_cpu_data.dcache.ways;
         waysize = current_cpu_data.dcache.sets;
@@ -118,7 +118,7 @@ static void __flush_dcache_page(unsigned long phys)
                 addrstart += current_cpu_data.dcache.way_incr;
         } while (--ways);
 
-        back_to_P1();
+        back_to_cached();
         local_irq_restore(flags);
 }
 
@@ -132,15 +132,15 @@ void flush_dcache_page(struct page *page)
                 __flush_dcache_page(PHYSADDR(page_address(page)));
 }
 
-void flush_cache_all(void)
+void __uses_jump_to_uncached flush_cache_all(void)
 {
         unsigned long flags;
 
         local_irq_save(flags);
-        jump_to_P2();
+        jump_to_uncached();
 
         cache_wback_all();
-        back_to_P1();
+        back_to_cached();
         local_irq_restore(flags);
 }
 
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index e220c29a3c00..7b2131c9eeda 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -1,7 +1,9 @@
 /*
  * arch/sh/mm/consistent.c
  *
- * Copyright (C) 2004  Paul Mundt
+ * Copyright (C) 2004 - 2007  Paul Mundt
+ *
+ * Declared coherent memory functions based on arch/x86/kernel/pci-dma_32.c
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -13,58 +15,152 @@
 #include <asm/addrspace.h>
 #include <asm/io.h>
 
-void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle)
+struct dma_coherent_mem {
+        void            *virt_base;
+        u32             device_base;
+        int             size;
+        int             flags;
+        unsigned long   *bitmap;
+};
+
+void *dma_alloc_coherent(struct device *dev, size_t size,
+                           dma_addr_t *dma_handle, gfp_t gfp)
 {
-        struct page *page, *end, *free;
         void *ret;
-        int order;
+        struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
+        int order = get_order(size);
 
-        size = PAGE_ALIGN(size);
-        order = get_order(size);
+        if (mem) {
+                int page = bitmap_find_free_region(mem->bitmap, mem->size,
+                                                     order);
+                if (page >= 0) {
+                        *dma_handle = mem->device_base + (page << PAGE_SHIFT);
+                        ret = mem->virt_base + (page << PAGE_SHIFT);
+                        memset(ret, 0, size);
+                        return ret;
+                }
+                if (mem->flags & DMA_MEMORY_EXCLUSIVE)
+                        return NULL;
+        }
 
-        page = alloc_pages(gfp, order);
-        if (!page)
-                return NULL;
-        split_page(page, order);
+        ret = (void *)__get_free_pages(gfp, order);
 
-        ret = page_address(page);
-        memset(ret, 0, size);
-        *handle = virt_to_phys(ret);
+        if (ret != NULL) {
+                memset(ret, 0, size);
+                /*
+                 * Pages from the page allocator may have data present in
+                 * cache. So flush the cache before using uncached memory.
+                 */
+                dma_cache_sync(NULL, ret, size, DMA_BIDIRECTIONAL);
+                *dma_handle = virt_to_phys(ret);
+        }
+        return ret;
+}
+EXPORT_SYMBOL(dma_alloc_coherent);
 
-        /*
-         * We must flush the cache before we pass it on to the device
-         */
-        __flush_purge_region(ret, size);
+void dma_free_coherent(struct device *dev, size_t size,
+                         void *vaddr, dma_addr_t dma_handle)
+{
+        struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
+        int order = get_order(size);
 
-        page = virt_to_page(ret);
-        free = page + (size >> PAGE_SHIFT);
-        end  = page + (1 << order);
+        if (mem && vaddr >= mem->virt_base && vaddr < (mem->virt_base + (mem->size << PAGE_SHIFT))) {
+                int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
 
-        while (++page < end) {
-                /* Free any unused pages */
-                if (page >= free) {
-                        __free_page(page);
-                }
+                bitmap_release_region(mem->bitmap, page, order);
+        } else {
+                WARN_ON(irqs_disabled());       /* for portability */
+                BUG_ON(mem && mem->flags & DMA_MEMORY_EXCLUSIVE);
+                free_pages((unsigned long)vaddr, order);
         }
+}
+EXPORT_SYMBOL(dma_free_coherent);
+
+int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
+                                dma_addr_t device_addr, size_t size, int flags)
+{
+        void __iomem *mem_base = NULL;
+        int pages = size >> PAGE_SHIFT;
+        int bitmap_size = BITS_TO_LONGS(pages) * sizeof(long);
+
+        if ((flags & (DMA_MEMORY_MAP | DMA_MEMORY_IO)) == 0)
+                goto out;
+        if (!size)
+                goto out;
+        if (dev->dma_mem)
+                goto out;
+
+        /* FIXME: this routine just ignores DMA_MEMORY_INCLUDES_CHILDREN */
 
-        return P2SEGADDR(ret);
+        mem_base = ioremap_nocache(bus_addr, size);
+        if (!mem_base)
+                goto out;
+
+        dev->dma_mem = kmalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
+        if (!dev->dma_mem)
+                goto out;
+        dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
+        if (!dev->dma_mem->bitmap)
+                goto free1_out;
+
+        dev->dma_mem->virt_base = mem_base;
+        dev->dma_mem->device_base = device_addr;
+        dev->dma_mem->size = pages;
+        dev->dma_mem->flags = flags;
+
+        if (flags & DMA_MEMORY_MAP)
+                return DMA_MEMORY_MAP;
+
+        return DMA_MEMORY_IO;
+
+ free1_out:
+        kfree(dev->dma_mem);
+ out:
+        if (mem_base)
+                iounmap(mem_base);
+        return 0;
 }
+EXPORT_SYMBOL(dma_declare_coherent_memory);
 
-void consistent_free(void *vaddr, size_t size)
+void dma_release_declared_memory(struct device *dev)
 {
-        unsigned long addr = P1SEGADDR((unsigned long)vaddr);
-        struct page *page=virt_to_page(addr);
-        int num_pages=(size+PAGE_SIZE-1) >> PAGE_SHIFT;
-        int i;
+        struct dma_coherent_mem *mem = dev->dma_mem;
 
-        for(i=0;i<num_pages;i++) {
-                __free_page((page+i));
-        }
+        if (!mem)
+                return;
+        dev->dma_mem = NULL;
+        iounmap(mem->virt_base);
+        kfree(mem->bitmap);
+        kfree(mem);
 }
+EXPORT_SYMBOL(dma_release_declared_memory);
 
-void consistent_sync(void *vaddr, size_t size, int direction)
+void *dma_mark_declared_memory_occupied(struct device *dev,
+                                        dma_addr_t device_addr, size_t size)
 {
-        void * p1addr = (void*) P1SEGADDR((unsigned long)vaddr);
+        struct dma_coherent_mem *mem = dev->dma_mem;
+        int pages = (size + (device_addr & ~PAGE_MASK) + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        int pos, err;
+
+        if (!mem)
+                return ERR_PTR(-EINVAL);
+
+        pos = (device_addr - mem->device_base) >> PAGE_SHIFT;
+        err = bitmap_allocate_region(mem->bitmap, pos, get_order(pages));
+        if (err != 0)
+                return ERR_PTR(err);
+        return mem->virt_base + (pos << PAGE_SHIFT);
+}
+EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
+
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+                    enum dma_data_direction direction)
+{
+#ifdef CONFIG_CPU_SH5
+        void *p1addr = vaddr;
+#else
+        void *p1addr = (void*) P1SEGADDR((unsigned long)vaddr);
+#endif
 
         switch (direction) {
         case DMA_FROM_DEVICE:           /* invalidate only */
@@ -80,8 +176,4 @@ void consistent_sync(void *vaddr, size_t size, int direction)
                 BUG();
         }
 }
-
-EXPORT_SYMBOL(consistent_alloc);
-EXPORT_SYMBOL(consistent_free);
-EXPORT_SYMBOL(consistent_sync);
-
+EXPORT_SYMBOL(dma_cache_sync);
diff --git a/arch/sh/mm/extable.c b/arch/sh/mm/extable_32.c
index c1cf4463d09d..c1cf4463d09d 100644
--- a/arch/sh/mm/extable.c
+++ b/arch/sh/mm/extable_32.c
diff --git a/arch/sh64/mm/extable.c b/arch/sh/mm/extable_64.c
index a2e6e0563772..f05499688d88 100644
--- a/arch/sh64/mm/extable.c
+++ b/arch/sh/mm/extable_64.c
@@ -1,14 +1,14 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/mm/extable.c
+ * arch/sh/mm/extable_64.c
  *
  * Copyright (C) 2003 Richard Curnow
  * Copyright (C) 2003, 2004  Paul Mundt
  *
  * Cloned from the 2.5 SH version..
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
 #include <linux/rwsem.h>
 #include <linux/module.h>
@@ -21,13 +21,16 @@ static const struct exception_table_entry __copy_user_fixup_ex = {
         .fixup = (unsigned long)&__copy_user_fixup,
 };
 
-/* Some functions that may trap due to a bad user-mode address have too many loads
-   and stores in them to make it at all practical to label each one and put them all in
-   the main exception table.
-
-   In particular, the fast memcpy routine is like this.  It's fix-up is just to fall back
-   to a slow byte-at-a-time copy, which is handled the conventional way.  So it's functionally
-   OK to just handle any trap occurring in the fast memcpy with that fixup. */
+/*
+ * Some functions that may trap due to a bad user-mode address have too
+ * many loads and stores in them to make it at all practical to label
+ * each one and put them all in the main exception table.
+ *
+ * In particular, the fast memcpy routine is like this.  It's fix-up is
+ * just to fall back to a slow byte-at-a-time copy, which is handled the
+ * conventional way.  So it's functionally OK to just handle any trap
+ * occurring in the fast memcpy with that fixup.
+ */
 static const struct exception_table_entry *check_exception_ranges(unsigned long addr)
 {
         if ((addr >= (unsigned long)&copy_user_memcpy) &&
@@ -77,4 +80,3 @@ int fixup_exception(struct pt_regs *regs)
 
         return 0;
 }
-
diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault_32.c
index 60d74f793a1d..33b43d20e9f6 100644
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault_32.c
@@ -172,7 +172,7 @@ no_context:
         bust_spinlocks(1);
 
         if (oops_may_print()) {
-                __typeof__(pte_val(__pte(0))) page;
+                unsigned long page;
 
                 if (address < PAGE_SIZE)
                         printk(KERN_ALERT "Unable to handle kernel NULL "
diff --git a/arch/sh64/mm/tlbmiss.c b/arch/sh/mm/fault_64.c
index b767d6cff72f..399d53710d2f 100644
--- a/arch/sh64/mm/tlbmiss.c
+++ b/arch/sh/mm/fault_64.c
@@ -1,9 +1,5 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/mm/tlbmiss.c
+ * The SH64 TLB miss.
  *
  * Original code from fault.c
  * Copyright (C) 2000, 2001  Paolo Alberelli
@@ -12,16 +8,20 @@
  * Copyright (C) 2003 Richard.Curnow@superh.com
  *
  * IMPORTANT NOTES :
- * The do_fast_page_fault function is called from a context in entry.S where very few registers
- * have been saved.  In particular, the code in this file must be compiled not to use ANY
- * caller-save registers that are not part of the restricted save set.  Also, it means that
- * code in this file must not make calls to functions elsewhere in the kernel, or else the
- * excepting context will see corruption in its caller-save registers.  Plus, the entry.S save
- * area is non-reentrant, so this code has to run with SR.BL==1, i.e. no interrupts taken inside
- * it and panic on any exception.
+ * The do_fast_page_fault function is called from a context in entry.S
+ * where very few registers have been saved.  In particular, the code in
+ * this file must be compiled not to use ANY caller-save registers that
+ * are not part of the restricted save set.  Also, it means that code in
+ * this file must not make calls to functions elsewhere in the kernel, or
+ * else the excepting context will see corruption in its caller-save
+ * registers.  Plus, the entry.S save area is non-reentrant, so this code
+ * has to run with SR.BL==1, i.e. no interrupts taken inside it and panic
+ * on any exception.
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -33,14 +33,13 @@
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/interrupt.h>
-
 #include <asm/system.h>
 #include <asm/tlb.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
-#include <asm/registers.h>              /* required by inline asm statements */
+#include <asm/cpu/registers.h>
 
 /* Callable from fault.c, so not static */
 inline void __do_tlb_refill(unsigned long address,
@@ -88,48 +87,47 @@ inline void __do_tlb_refill(unsigned long address,
 
 }
 
-static int handle_vmalloc_fault(struct mm_struct *mm, unsigned long protection_flags,
+static int handle_vmalloc_fault(struct mm_struct *mm,
+                                unsigned long protection_flags,
                                 unsigned long long textaccess,
                                 unsigned long address)
 {
         pgd_t *dir;
+        pud_t *pud;
         pmd_t *pmd;
         static pte_t *pte;
         pte_t entry;
 
         dir = pgd_offset_k(address);
-        pmd = pmd_offset(dir, address);
 
-        if (pmd_none(*pmd)) {
+        pud = pud_offset(dir, address);
+        if (pud_none_or_clear_bad(pud))
                 return 0;
-        }
 
-        if (pmd_bad(*pmd)) {
-                pmd_clear(pmd);
+        pmd = pmd_offset(pud, address);
+        if (pmd_none_or_clear_bad(pmd))
                 return 0;
-        }
 
         pte = pte_offset_kernel(pmd, address);
         entry = *pte;
 
-        if (pte_none(entry) || !pte_present(entry)) {
+        if (pte_none(entry) || !pte_present(entry))
                 return 0;
-        }
-
-        if ((pte_val(entry) & protection_flags) != protection_flags) {
+        if ((pte_val(entry) & protection_flags) != protection_flags)
                 return 0;
-        }
 
         __do_tlb_refill(address, textaccess, pte);
 
         return 1;
 }
 
-static int handle_tlbmiss(struct mm_struct *mm, unsigned long long protection_flags,
-                        unsigned long long textaccess,
-                        unsigned long address)
+static int handle_tlbmiss(struct mm_struct *mm,
+                          unsigned long long protection_flags,
+                          unsigned long long textaccess,
+                          unsigned long address)
 {
         pgd_t *dir;
+        pud_t *pud;
         pmd_t *pmd;
         pte_t *pte;
         pte_t entry;
@@ -144,49 +142,49 @@ static int handle_tlbmiss(struct mm_struct *mm, unsigned long long protection_fl
 
            See how mm->pgd is allocated and initialised in pgd_alloc to see why
            the next test is necessary.  - RPC */
-        if (address >= (unsigned long) TASK_SIZE) {
+        if (address >= (unsigned long) TASK_SIZE)
                 /* upper half - never has page table entries. */
                 return 0;
-        }
+
         dir = pgd_offset(mm, address);
-        if (pgd_none(*dir)) {
+        if (pgd_none(*dir) || !pgd_present(*dir))
                 return 0;
-        }
-        if (!pgd_present(*dir)) {
+        if (!pgd_present(*dir))
                 return 0;
-        }
 
-        pmd = pmd_offset(dir, address);
-        if (pmd_none(*pmd)) {
+        pud = pud_offset(dir, address);
+        if (pud_none(*pud) || !pud_present(*pud))
                 return 0;
-        }
-        if (!pmd_present(*pmd)) {
+
+        pmd = pmd_offset(pud, address);
+        if (pmd_none(*pmd) || !pmd_present(*pmd))
                 return 0;
-        }
+
         pte = pte_offset_kernel(pmd, address);
         entry = *pte;
-        if (pte_none(entry)) {
-                return 0;
-        }
-        if (!pte_present(entry)) {
+
+        if (pte_none(entry) || !pte_present(entry))
                 return 0;
-        }
 
-        /* If the page doesn't have sufficient protection bits set to service the
-           kind of fault being handled, there's not much point doing the TLB refill.
-           Punt the fault to the general handler. */
-        if ((pte_val(entry) & protection_flags) != protection_flags) {
+        /*
+         * If the page doesn't have sufficient protection bits set to
+         * service the kind of fault being handled, there's not much
+         * point doing the TLB refill.  Punt the fault to the general
+         * handler.
+         */
+        if ((pte_val(entry) & protection_flags) != protection_flags)
                 return 0;
-        }
 
         __do_tlb_refill(address, textaccess, pte);
 
         return 1;
 }
 
-/* Put all this information into one structure so that everything is just arithmetic
-   relative to a single base address.  This reduces the number of movi/shori pairs needed
-   just to load addresses of static data. */
+/*
+ * Put all this information into one structure so that everything is just
+ * arithmetic relative to a single base address.  This reduces the number
+ * of movi/shori pairs needed just to load addresses of static data.
+ */
 struct expevt_lookup {
         unsigned short protection_flags[8];
         unsigned char  is_text_access[8];
@@ -216,7 +214,8 @@ static struct expevt_lookup expevt_lookup_table = {
    general fault handling in fault.c which deals with mapping file-backed
    pages, stack growth, segmentation faults, swapping etc etc)
  */
-asmlinkage int do_fast_page_fault(unsigned long long ssr_md, unsigned long long expevt,
+asmlinkage int do_fast_page_fault(unsigned long long ssr_md,
+                                  unsigned long long expevt,
                                   unsigned long address)
 {
         struct task_struct *tsk;
@@ -226,26 +225,23 @@ asmlinkage int do_fast_page_fault(unsigned long long ssr_md, unsigned long long
         unsigned long long index;
         unsigned long long expevt4;
 
-        /* The next few lines implement a way of hashing EXPEVT into a small array index
-           which can be used to lookup parameters specific to the type of TLBMISS being
-           handled.  Note:
-           ITLBMISS has EXPEVT==0xa40
-           RTLBMISS has EXPEVT==0x040
-           WTLBMISS has EXPEVT==0x060
-        */
-
+        /* The next few lines implement a way of hashing EXPEVT into a
+         * small array index which can be used to lookup parameters
+         * specific to the type of TLBMISS being handled.
+         *
+         * Note:
+         *      ITLBMISS has EXPEVT==0xa40
+         *      RTLBMISS has EXPEVT==0x040
+         *      WTLBMISS has EXPEVT==0x060
+         */
         expevt4 = (expevt >> 4);
-        /* TODO : xor ssr_md into this expression too.  Then we can check that PRU is set
-           when it needs to be. */
+        /* TODO : xor ssr_md into this expression too. Then we can check
+         * that PRU is set when it needs to be. */
         index = expevt4 ^ (expevt4 >> 5);
         index &= 7;
         protection_flags = expevt_lookup_table.protection_flags[index];
         textaccess       = expevt_lookup_table.is_text_access[index];
 
-#ifdef CONFIG_SH64_PROC_TLB
-        ++calls_to_do_fast_page_fault;
-#endif
-
         /* SIM
          * Note this is now called with interrupts still disabled
          * This is to cope with being called for a missing IO port
@@ -262,18 +258,18 @@ asmlinkage int do_fast_page_fault(unsigned long long ssr_md, unsigned long long
 
         if ((address >= VMALLOC_START && address < VMALLOC_END) ||
             (address >= IOBASE_VADDR  && address < IOBASE_END)) {
-                if (ssr_md) {
-                        /* Process-contexts can never have this address range mapped */
-                        if (handle_vmalloc_fault(mm, protection_flags, textaccess, address)) {
+                if (ssr_md)
+                        /*
+                         * Process-contexts can never have this address
+                         * range mapped
+                         */
+                        if (handle_vmalloc_fault(mm, protection_flags,
+                                                 textaccess, address))
                                 return 1;
-                        }
-                }
         } else if (!in_interrupt() && mm) {
-                if (handle_tlbmiss(mm, protection_flags, textaccess, address)) {
+                if (handle_tlbmiss(mm, protection_flags, textaccess, address))
                         return 1;
-                }
         }
 
         return 0;
 }
-
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index d5e160da64b2..2918c6b14659 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -23,9 +23,7 @@
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 pgd_t swapper_pg_dir[PTRS_PER_PGD];
-
-void (*copy_page)(void *from, void *to);
-void (*clear_page)(void *to);
+unsigned long cached_to_uncached = 0;
 
 void show_mem(void)
 {
@@ -102,7 +100,8 @@ static void set_pte_phys(unsigned long addr, unsigned long phys, pgprot_t prot)
 
         set_pte(pte, pfn_pte(phys >> PAGE_SHIFT, prot));
 
-        flush_tlb_one(get_asid(), addr);
+        if (cached_to_uncached)
+                flush_tlb_one(get_asid(), addr);
 }
 
 /*
@@ -131,6 +130,37 @@ void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
 
         set_pte_phys(address, phys, prot);
 }
+
+void __init page_table_range_init(unsigned long start, unsigned long end,
+                                         pgd_t *pgd_base)
+{
+        pgd_t *pgd;
+        pud_t *pud;
+        pmd_t *pmd;
+        int pgd_idx;
+        unsigned long vaddr;
+
+        vaddr = start & PMD_MASK;
+        end = (end + PMD_SIZE - 1) & PMD_MASK;
+        pgd_idx = pgd_index(vaddr);
+        pgd = pgd_base + pgd_idx;
+
+        for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
+                BUG_ON(pgd_none(*pgd));
+                pud = pud_offset(pgd, 0);
+                BUG_ON(pud_none(*pud));
+                pmd = pmd_offset(pud, 0);
+
+                if (!pmd_present(*pmd)) {
+                        pte_t *pte_table;
+                        pte_table = (pte_t *)alloc_bootmem_low_pages(PAGE_SIZE);
+                        memset(pte_table, 0, PAGE_SIZE);
+                        pmd_populate_kernel(&init_mm, pmd, pte_table);
+                }
+
+                vaddr += PMD_SIZE;
+        }
+}
 #endif  /* CONFIG_MMU */
 
 /*
@@ -150,6 +180,11 @@ void __init paging_init(void)
          * check for a null value. */
         set_TTB(swapper_pg_dir);
 
+        /* Populate the relevant portions of swapper_pg_dir so that
+         * we can use the fixmap entries without calling kmalloc.
+         * pte's will be filled in by __set_fixmap(). */
+        page_table_range_init(FIXADDR_START, FIXADDR_TOP, swapper_pg_dir);
+
         memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
 
         for_each_online_node(nid) {
@@ -167,9 +202,22 @@ void __init paging_init(void)
         }
 
         free_area_init_nodes(max_zone_pfns);
+
+        /* Set up the uncached fixmap */
+        set_fixmap_nocache(FIX_UNCACHED, __pa(&__uncached_start));
+
+#ifdef CONFIG_29BIT
+        /*
+         * Handle trivial transitions between cached and uncached
+         * segments, making use of the 1:1 mapping relationship in
+         * 512MB lowmem.
+         */
+        cached_to_uncached = P2SEG - P1SEG;
+#endif
 }
 
 static struct kcore_list kcore_mem, kcore_vmalloc;
+int after_bootmem = 0;
 
 void __init mem_init(void)
 {
@@ -202,17 +250,7 @@ void __init mem_init(void)
         memset(empty_zero_page, 0, PAGE_SIZE);
         __flush_wback_region(empty_zero_page, PAGE_SIZE);
 
-        /*
-         * Setup wrappers for copy/clear_page(), these will get overridden
-         * later in the boot process if a better method is available.
-         */
-#ifdef CONFIG_MMU
-        copy_page = copy_page_slow;
-        clear_page = clear_page_slow;
-#else
-        copy_page = copy_page_nommu;
-        clear_page = clear_page_nommu;
-#endif
+        after_bootmem = 1;
 
         codesize =  (unsigned long) &_etext - (unsigned long) &_text;
         datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap_32.c
index 0c7b7e33abdc..0c7b7e33abdc 100644
--- a/arch/sh/mm/ioremap.c
+++ b/arch/sh/mm/ioremap_32.c
diff --git a/arch/sh64/mm/ioremap.c b/arch/sh/mm/ioremap_64.c
index 535304e6601f..e27d16519235 100644
--- a/arch/sh64/mm/ioremap.c
+++ b/arch/sh/mm/ioremap_64.c
@@ -1,30 +1,31 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/mm/ioremap.c
+ * arch/sh/mm/ioremap_64.c
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
+ * Copyright (C) 2003 - 2007  Paul Mundt
  *
  * Mostly derived from arch/sh/mm/ioremap.c which, in turn is mostly
  * derived from arch/i386/mm/ioremap.c .
  *
  *   (C) Copyright 1995 1996 Linus Torvalds
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-#include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/io.h>
 #include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/io.h>
 #include <linux/bootmem.h>
 #include <linux/proc_fs.h>
-#include <linux/module.h>
+#include <asm/page.h>
 #include <asm/pgalloc.h>
+#include <asm/addrspace.h>
+#include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
+#include <asm/mmu.h>
 
 static void shmedia_mapioaddr(unsigned long, unsigned long);
 static unsigned long shmedia_ioremap(struct resource *, u32, int);
@@ -42,7 +43,8 @@ static unsigned long shmedia_ioremap(struct resource *, u32, int);
  * have to convert them into an offset in a page-aligned mapping, but the
  * caller shouldn't need to know that small detail.
  */
-void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
+void *__ioremap(unsigned long phys_addr, unsigned long size,
+                unsigned long flags)
 {
         void * addr;
         struct vm_struct * area;
@@ -83,7 +85,7 @@ void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flag
 }
 EXPORT_SYMBOL(__ioremap);
 
-void iounmap(void *addr)
+void __iounmap(void *addr)
 {
         struct vm_struct *area;
 
@@ -96,7 +98,7 @@ void iounmap(void *addr)
 
         kfree(area);
 }
-EXPORT_SYMBOL(iounmap);
+EXPORT_SYMBOL(__iounmap);
 
 static struct resource shmedia_iomap = {
         .name   = "shmedia_iomap",
@@ -265,6 +267,7 @@ static __init_refok void *sh64_get_page(void)
 static void shmedia_mapioaddr(unsigned long pa, unsigned long va)
 {
         pgd_t *pgdp;
+        pud_t *pudp;
         pmd_t *pmdp;
         pte_t *ptep, pte;
         pgprot_t prot;
@@ -274,11 +277,17 @@ static void shmedia_mapioaddr(unsigned long pa, unsigned long va)
 
         pgdp = pgd_offset_k(va);
         if (pgd_none(*pgdp) || !pgd_present(*pgdp)) {
+                pudp = (pud_t *)sh64_get_page();
+                set_pgd(pgdp, __pgd((unsigned long)pudp | _KERNPG_TABLE));
+        }
+
+        pudp = pud_offset(pgdp, va);
+        if (pud_none(*pudp) || !pud_present(*pudp)) {
                 pmdp = (pmd_t *)sh64_get_page();
-                set_pgd(pgdp, __pgd((unsigned long)pmdp | _KERNPG_TABLE));
+                set_pud(pudp, __pud((unsigned long)pmdp | _KERNPG_TABLE));
         }
 
-        pmdp = pmd_offset(pgdp, va);
+        pmdp = pmd_offset(pudp, va);
         if (pmd_none(*pmdp) || !pmd_present(*pmdp) ) {
                 ptep = (pte_t *)sh64_get_page();
                 set_pmd(pmdp, __pmd((unsigned long)ptep + _PAGE_TABLE));
@@ -302,12 +311,19 @@ static void shmedia_mapioaddr(unsigned long pa, unsigned long va)
 static void shmedia_unmapioaddr(unsigned long vaddr)
 {
         pgd_t *pgdp;
+        pud_t *pudp;
         pmd_t *pmdp;
         pte_t *ptep;
 
         pgdp = pgd_offset_k(vaddr);
-        pmdp = pmd_offset(pgdp, vaddr);
+        if (pgd_none(*pgdp) || pgd_bad(*pgdp))
+                return;
+
+        pudp = pud_offset(pgdp, vaddr);
+        if (pud_none(*pudp) || pud_bad(*pudp))
+                return;
 
+        pmdp = pmd_offset(pudp, vaddr);
         if (pmd_none(*pmdp) || pmd_bad(*pmdp))
                 return;
 
diff --git a/arch/sh/mm/pg-nommu.c b/arch/sh/mm/pg-nommu.c
index d15221beaa16..677dd57f0877 100644
--- a/arch/sh/mm/pg-nommu.c
+++ b/arch/sh/mm/pg-nommu.c
@@ -14,12 +14,12 @@
 #include <linux/string.h>
 #include <asm/page.h>
 
-void copy_page_nommu(void *to, void *from)
+void copy_page(void *to, void *from)
 {
         memcpy(to, from, PAGE_SIZE);
 }
 
-void clear_page_nommu(void *to)
+void clear_page(void *to)
 {
         memset(to, 0, PAGE_SIZE);
 }
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
index 1d45b82f0a63..ab81c602295f 100644
--- a/arch/sh/mm/pmb.c
+++ b/arch/sh/mm/pmb.c
@@ -27,6 +27,7 @@
 #include <asm/pgtable.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
+#include <asm/mmu_context.h>
 
 #define NR_PMB_ENTRIES  16
 
@@ -162,18 +163,18 @@ repeat:
         return 0;
 }
 
-int set_pmb_entry(struct pmb_entry *pmbe)
+int __uses_jump_to_uncached set_pmb_entry(struct pmb_entry *pmbe)
 {
         int ret;
 
-        jump_to_P2();
+        jump_to_uncached();
         ret = __set_pmb_entry(pmbe->vpn, pmbe->ppn, pmbe->flags, &pmbe->entry);
-        back_to_P1();
+        back_to_cached();
 
         return ret;
 }
 
-void clear_pmb_entry(struct pmb_entry *pmbe)
+void __uses_jump_to_uncached clear_pmb_entry(struct pmb_entry *pmbe)
 {
         unsigned int entry = pmbe->entry;
         unsigned long addr;
@@ -187,7 +188,7 @@ void clear_pmb_entry(struct pmb_entry *pmbe)
                      entry >= NR_PMB_ENTRIES))
                 return;
 
-        jump_to_P2();
+        jump_to_uncached();
 
         /* Clear V-bit */
         addr = mk_pmb_addr(entry);
@@ -196,7 +197,7 @@ void clear_pmb_entry(struct pmb_entry *pmbe)
         addr = mk_pmb_data(entry);
         ctrl_outl(ctrl_inl(addr) & ~PMB_V, addr);
 
-        back_to_P1();
+        back_to_cached();
 
         clear_bit(entry, &pmb_map);
 }
@@ -301,17 +302,17 @@ static void pmb_cache_ctor(struct kmem_cache *cachep, void *pmb)
         pmbe->entry = PMB_NO_ENTRY;
 }
 
-static int __init pmb_init(void)
+static int __uses_jump_to_uncached pmb_init(void)
 {
         unsigned int nr_entries = ARRAY_SIZE(pmb_init_map);
-        unsigned int entry;
+        unsigned int entry, i;
 
         BUG_ON(unlikely(nr_entries >= NR_PMB_ENTRIES));
 
         pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry), 0,
                                       SLAB_PANIC, pmb_cache_ctor);
 
-        jump_to_P2();
+        jump_to_uncached();
 
         /*
          * Ordering is important, P2 must be mapped in the PMB before we
@@ -329,7 +330,12 @@ static int __init pmb_init(void)
         /* PMB.SE and UB[7] */
         ctrl_outl((1 << 31) | (1 << 7), PMB_PASCR);
 
-        back_to_P1();
+        /* Flush out the TLB */
+        i =  ctrl_inl(MMUCR);
+        i |= MMUCR_TI;
+        ctrl_outl(i, MMUCR);
+
+        back_to_cached();
 
         return 0;
 }
diff --git a/arch/sh/mm/tlb-nommu.c b/arch/sh/mm/tlb-nommu.c
index 1ccca7c0532e..15111bc7ddd6 100644
--- a/arch/sh/mm/tlb-nommu.c
+++ b/arch/sh/mm/tlb-nommu.c
@@ -9,6 +9,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <asm/pgtable.h>
 
 /*
  * Nothing too terribly exciting here ..
@@ -49,3 +50,12 @@ void update_mmu_cache(struct vm_area_struct * vma,
 {
         BUG();
 }
+
+void __init page_table_range_init(unsigned long start, unsigned long end,
+                                  pgd_t *pgd_base)
+{
+}
+
+void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
+{
+}
diff --git a/arch/sh/mm/tlb-sh4.c b/arch/sh/mm/tlb-sh4.c
index 2d1dd6044307..f0c7b7397fa6 100644
--- a/arch/sh/mm/tlb-sh4.c
+++ b/arch/sh/mm/tlb-sh4.c
@@ -79,7 +79,8 @@ void update_mmu_cache(struct vm_area_struct * vma,
         local_irq_restore(flags);
 }
 
-void local_flush_tlb_one(unsigned long asid, unsigned long page)
+void __uses_jump_to_uncached local_flush_tlb_one(unsigned long asid,
+                                                 unsigned long page)
 {
         unsigned long addr, data;
 
@@ -91,7 +92,7 @@ void local_flush_tlb_one(unsigned long asid, unsigned long page)
          */
         addr = MMU_UTLB_ADDRESS_ARRAY | MMU_PAGE_ASSOC_BIT;
         data = page | asid; /* VALID bit is off */
-        jump_to_P2();
+        jump_to_uncached();
         ctrl_outl(data, addr);
-        back_to_P1();
+        back_to_cached();
 }
diff --git a/arch/sh64/mm/tlb.c b/arch/sh/mm/tlb-sh5.c
index d517e7d70340..f34274a1ded3 100644
--- a/arch/sh64/mm/tlb.c
+++ b/arch/sh/mm/tlb-sh5.c
@@ -1,5 +1,5 @@
 /*
- * arch/sh64/mm/tlb.c
+ * arch/sh/mm/tlb-sh5.c
  *
  * Copyright (C) 2003  Paul Mundt <lethal@linux-sh.org>
  * Copyright (C) 2003  Richard Curnow <richard.curnow@superh.com>
@@ -7,7 +7,6 @@
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
- *
  */
 #include <linux/mm.h>
 #include <linux/init.h>
@@ -163,4 +162,3 @@ inline void sh64_setup_tlb_slot(unsigned long long config_addr,
  */
 inline void sh64_teardown_tlb_slot(unsigned long long config_addr)
         __attribute__ ((alias("__flush_tlb_slot")));
-
diff --git a/arch/sh/mm/tlb-flush.c b/arch/sh/mm/tlbflush_32.c
index 6f45c1f8a7fe..6f45c1f8a7fe 100644
--- a/arch/sh/mm/tlb-flush.c
+++ b/arch/sh/mm/tlbflush_32.c
diff --git a/arch/sh64/mm/fault.c b/arch/sh/mm/tlbflush_64.c
index 7c79a1ba8059..2a98c9ec88ff 100644
--- a/arch/sh64/mm/fault.c
+++ b/arch/sh/mm/tlbflush_64.c
@@ -1,16 +1,14 @@
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/mm/fault.c
+ * arch/sh/mm/tlb-flush_64.c
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003  Richard Curnow (/proc/tlb, bug fixes)
  * Copyright (C) 2003  Paul Mundt
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #include <linux/signal.h>
 #include <linux/rwsem.h>
 #include <linux/sched.h>
@@ -23,39 +21,12 @@
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/interrupt.h>
-
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/tlb.h>
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
-#include <asm/registers.h>              /* required by inline asm statements */
-
-#if defined(CONFIG_SH64_PROC_TLB)
-#include <linux/init.h>
-#include <linux/proc_fs.h>
-/* Count numbers of tlb refills in each region */
-static unsigned long long calls_to_update_mmu_cache = 0ULL;
-static unsigned long long calls_to_flush_tlb_page   = 0ULL;
-static unsigned long long calls_to_flush_tlb_range  = 0ULL;
-static unsigned long long calls_to_flush_tlb_mm     = 0ULL;
-static unsigned long long calls_to_flush_tlb_all    = 0ULL;
-unsigned long long calls_to_do_slow_page_fault = 0ULL;
-unsigned long long calls_to_do_fast_page_fault = 0ULL;
-
-/* Count size of ranges for flush_tlb_range */
-static unsigned long long flush_tlb_range_1         = 0ULL;
-static unsigned long long flush_tlb_range_2         = 0ULL;
-static unsigned long long flush_tlb_range_3_4       = 0ULL;
-static unsigned long long flush_tlb_range_5_7       = 0ULL;
-static unsigned long long flush_tlb_range_8_11      = 0ULL;
-static unsigned long long flush_tlb_range_12_15     = 0ULL;
-static unsigned long long flush_tlb_range_16_up     = 0ULL;
-
-static unsigned long long page_not_present          = 0ULL;
-
-#endif
 
 extern void die(const char *,struct pt_regs *,long);
 
@@ -87,29 +58,27 @@ static inline void print_task(struct task_struct *tsk)
 static pte_t *lookup_pte(struct mm_struct *mm, unsigned long address)
 {
         pgd_t *dir;
+        pud_t *pud;
         pmd_t *pmd;
         pte_t *pte;
         pte_t entry;
 
         dir = pgd_offset(mm, address);
-        if (pgd_none(*dir)) {
+        if (pgd_none(*dir))
                 return NULL;
-        }
 
-        pmd = pmd_offset(dir, address);
-        if (pmd_none(*pmd)) {
+        pud = pud_offset(dir, address);
+        if (pud_none(*pud))
+                return NULL;
+
+        pmd = pmd_offset(pud, address);
+        if (pmd_none(*pmd))
                 return NULL;
-        }
 
         pte = pte_offset_kernel(pmd, address);
         entry = *pte;
-
-        if (pte_none(entry)) {
+        if (pte_none(entry) || !pte_present(entry))
                 return NULL;
-        }
-        if (!pte_present(entry)) {
-                return NULL;
-        }
 
         return pte;
 }
@@ -129,10 +98,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
         pte_t *pte;
         int fault;
 
-#if defined(CONFIG_SH64_PROC_TLB)
-        ++calls_to_do_slow_page_fault;
-#endif
-
         /* SIM
          * Note this is now called with interrupts still disabled
          * This is to cope with being called for a missing IO port
@@ -355,16 +320,9 @@ do_sigbus:
                 goto no_context;
 }
 
-
-void flush_tlb_all(void);
-
 void update_mmu_cache(struct vm_area_struct * vma,
                         unsigned long address, pte_t pte)
 {
-#if defined(CONFIG_SH64_PROC_TLB)
-        ++calls_to_update_mmu_cache;
-#endif
-
         /*
          * This appears to get called once for every pte entry that gets
          * established => I don't think it's efficient to try refilling the
@@ -378,40 +336,29 @@ void update_mmu_cache(struct vm_area_struct * vma,
          */
 }
 
-static void __flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
+void local_flush_tlb_one(unsigned long asid, unsigned long page)
 {
         unsigned long long match, pteh=0, lpage;
         unsigned long tlb;
-        struct mm_struct *mm;
-
-        mm = vma->vm_mm;
-
-        if (mm->context == NO_CONTEXT)
-                return;
 
         /*
          * Sign-extend based on neff.
          */
         lpage = (page & NEFF_SIGN) ? (page | NEFF_MASK) : page;
-        match = ((mm->context & MMU_CONTEXT_ASID_MASK) << PTEH_ASID_SHIFT) | PTEH_VALID;
+        match = (asid << PTEH_ASID_SHIFT) | PTEH_VALID;
         match |= lpage;
 
-        /* Do ITLB : don't bother for pages in non-exectutable VMAs */
-        if (vma->vm_flags & VM_EXEC) {
-                for_each_itlb_entry(tlb) {
-                        asm volatile ("getcfg   %1, 0, %0"
-                                      : "=r" (pteh)
-                                      : "r" (tlb) );
-
-                        if (pteh == match) {
-                                __flush_tlb_slot(tlb);
-                                break;
-                        }
+        for_each_itlb_entry(tlb) {
+                asm volatile ("getcfg   %1, 0, %0"
+                              : "=r" (pteh)
+                              : "r" (tlb) );
 
+                if (pteh == match) {
+                        __flush_tlb_slot(tlb);
+                        break;
                 }
         }
 
-        /* Do DTLB : any page could potentially be in here. */
         for_each_dtlb_entry(tlb) {
                 asm volatile ("getcfg   %1, 0, %0"
                               : "=r" (pteh)
@@ -425,52 +372,29 @@ static void __flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
         }
 }
 
-void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
+void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
 {
         unsigned long flags;
 
-#if defined(CONFIG_SH64_PROC_TLB)
-        ++calls_to_flush_tlb_page;
-#endif
-
         if (vma->vm_mm) {
                 page &= PAGE_MASK;
                 local_irq_save(flags);
-                __flush_tlb_page(vma, page);
+                local_flush_tlb_one(get_asid(), page);
                 local_irq_restore(flags);
         }
 }
 
-void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
-                     unsigned long end)
+void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
+                           unsigned long end)
 {
         unsigned long flags;
         unsigned long long match, pteh=0, pteh_epn, pteh_low;
         unsigned long tlb;
+        unsigned int cpu = smp_processor_id();
         struct mm_struct *mm;
 
         mm = vma->vm_mm;
-
-#if defined(CONFIG_SH64_PROC_TLB)
-        ++calls_to_flush_tlb_range;
-
-        {
-                unsigned long size = (end - 1) - start;
-                size >>= 12; /* divide by PAGE_SIZE */
-                size++; /* end=start+4096 => 1 page */
-                switch (size) {
-                  case  1        : flush_tlb_range_1++;     break;
-                  case  2        : flush_tlb_range_2++;     break;
-                  case  3 ...  4 : flush_tlb_range_3_4++;   break;
-                  case  5 ...  7 : flush_tlb_range_5_7++;   break;
-                  case  8 ... 11 : flush_tlb_range_8_11++;  break;
-                  case 12 ... 15 : flush_tlb_range_12_15++; break;
-                  default        : flush_tlb_range_16_up++; break;
-                }
-        }
-#endif
-
-        if (mm->context == NO_CONTEXT)
+        if (cpu_context(cpu, mm) == NO_CONTEXT)
                 return;
 
         local_irq_save(flags);
@@ -478,7 +402,7 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
         start &= PAGE_MASK;
         end &= PAGE_MASK;
 
-        match = ((mm->context & MMU_CONTEXT_ASID_MASK) << PTEH_ASID_SHIFT) | PTEH_VALID;
+        match = (cpu_asid(cpu, mm) << PTEH_ASID_SHIFT) | PTEH_VALID;
 
         /* Flush ITLB */
         for_each_itlb_entry(tlb) {
@@ -509,94 +433,43 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
         local_irq_restore(flags);
 }
 
-void flush_tlb_mm(struct mm_struct *mm)
+void local_flush_tlb_mm(struct mm_struct *mm)
 {
         unsigned long flags;
+        unsigned int cpu = smp_processor_id();
 
-#if defined(CONFIG_SH64_PROC_TLB)
-        ++calls_to_flush_tlb_mm;
-#endif
-
-        if (mm->context == NO_CONTEXT)
+        if (cpu_context(cpu, mm) == NO_CONTEXT)
                 return;
 
         local_irq_save(flags);
 
-        mm->context=NO_CONTEXT;
-        if(mm==current->mm)
-                activate_context(mm);
+        cpu_context(cpu, mm) = NO_CONTEXT;
+        if (mm == current->mm)
+                activate_context(mm, cpu);
 
         local_irq_restore(flags);
-
 }
 
-void flush_tlb_all(void)
+void local_flush_tlb_all(void)
 {
         /* Invalidate all, including shared pages, excluding fixed TLBs */
-
         unsigned long flags, tlb;
 
-#if defined(CONFIG_SH64_PROC_TLB)
-        ++calls_to_flush_tlb_all;
-#endif
-
         local_irq_save(flags);
 
         /* Flush each ITLB entry */
-        for_each_itlb_entry(tlb) {
+        for_each_itlb_entry(tlb)
                 __flush_tlb_slot(tlb);
-        }
 
         /* Flush each DTLB entry */
-        for_each_dtlb_entry(tlb) {
+        for_each_dtlb_entry(tlb)
                 __flush_tlb_slot(tlb);
-        }
 
         local_irq_restore(flags);
 }
 
-void flush_tlb_kernel_range(unsigned long start, unsigned long end)
+void local_flush_tlb_kernel_range(unsigned long start, unsigned long end)
 {
         /* FIXME: Optimize this later.. */
         flush_tlb_all();
 }
-
-#if defined(CONFIG_SH64_PROC_TLB)
-/* Procfs interface to read the performance information */
-
-static int
-tlb_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, void *data)
-{
-  int len=0;
-  len += sprintf(buf+len, "do_fast_page_fault   called %12lld times\n", calls_to_do_fast_page_fault);
-  len += sprintf(buf+len, "do_slow_page_fault   called %12lld times\n", calls_to_do_slow_page_fault);
-  len += sprintf(buf+len, "update_mmu_cache     called %12lld times\n", calls_to_update_mmu_cache);
-  len += sprintf(buf+len, "flush_tlb_page       called %12lld times\n", calls_to_flush_tlb_page);
-  len += sprintf(buf+len, "flush_tlb_range      called %12lld times\n", calls_to_flush_tlb_range);
-  len += sprintf(buf+len, "flush_tlb_mm         called %12lld times\n", calls_to_flush_tlb_mm);
-  len += sprintf(buf+len, "flush_tlb_all        called %12lld times\n", calls_to_flush_tlb_all);
-  len += sprintf(buf+len, "flush_tlb_range_sizes\n"
-                          " 1      : %12lld\n"
-                          " 2      : %12lld\n"
-                          " 3 -  4 : %12lld\n"
-                          " 5 -  7 : %12lld\n"
-                          " 8 - 11 : %12lld\n"
-                          "12 - 15 : %12lld\n"
-                          "16+     : %12lld\n",
-                          flush_tlb_range_1, flush_tlb_range_2, flush_tlb_range_3_4,
-                          flush_tlb_range_5_7, flush_tlb_range_8_11, flush_tlb_range_12_15,
-                          flush_tlb_range_16_up);
-  len += sprintf(buf+len, "page not present           %12lld times\n", page_not_present);
-  *eof = 1;
-  return len;
-}
-
-static int __init register_proc_tlb(void)
-{
-  create_proc_read_entry("tlb", 0, NULL, tlb_proc_info, NULL);
-  return 0;
-}
-
-__initcall(register_proc_tlb);
-
-#endif
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types
index ff071693325c..25810670a0fa 100644
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -29,7 +29,6 @@ HP6XX			SH_HP6XX
 DREAMCAST               SH_DREAMCAST
 MPC1211                 SH_MPC1211
 SNAPGEAR                SH_SECUREEDGE5410
-HS7751RVOIP             SH_HS7751RVOIP
 EDOSK7705               SH_EDOSK7705
 SH4202_MICRODEV         SH_SH4202_MICRODEV
 SH03                    SH_SH03
@@ -45,3 +44,4 @@ X3PROTO			SH_X3PROTO
 MAGICPANELR2            SH_MAGIC_PANEL_R2
 R2D_PLUS                RTS7751R2D_PLUS
 R2D_1                   RTS7751R2D_1
+CAYMAN                  SH_CAYMAN
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
deleted file mode 100644
index 6884d5a518ad..000000000000
--- a/arch/sh64/Kconfig
+++ /dev/null
@@ -1,295 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux/SH64 Kernel Configuration"
-
-config SUPERH
-        bool
-        default y
-
-config SUPERH64
-        bool
-        default y
-
-config MMU
-        bool
-        default y
-
-config QUICKLIST
-        def_bool y
-
-config RWSEM_GENERIC_SPINLOCK
-        bool
-        default y
-
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
-config GENERIC_HWEIGHT
-        bool
-        default y
-
-config GENERIC_CALIBRATE_DELAY
-        bool
-        default y
-
-config GENERIC_HARDIRQS
-        bool
-        default y
-
-config GENERIC_IRQ_PROBE
-        bool
-        default y
-
-config RWSEM_XCHGADD_ALGORITHM
-        bool
-
-config ARCH_HAS_ILOG2_U32
-        bool
-        default n
-
-config ARCH_HAS_ILOG2_U64
-        bool
-        default n
-
-config ARCH_NO_VIRT_TO_BUS
-        def_bool y
-
-source init/Kconfig
-
-menu "System type"
-
-choice
-        prompt "SuperH system type"
-        default SH_SIMULATOR
-
-config SH_SIMULATOR
-        bool "Simulator"
-
-config SH_CAYMAN
-        bool "Cayman"
-
-config SH_HARP
-        bool "ST50-Harp"
-
-endchoice
-
-choice
-        prompt "Processor family"
-        default CPU_SH5
-
-config CPU_SH5
-        bool "SH-5"
-
-endchoice
-
-choice
-        prompt "Processor type"
-
-config CPU_SUBTYPE_SH5_101
-        bool "SH5-101"
-        depends on CPU_SH5
-
-config CPU_SUBTYPE_SH5_103
-        bool "SH5-103"
-        depends on CPU_SH5
-
-endchoice
-
-choice
-        prompt "Endianness"
-        default LITTLE_ENDIAN
-
-config LITTLE_ENDIAN
-        bool "Little-Endian"
-
-config BIG_ENDIAN
-        bool "Big-Endian"
-
-endchoice
-
-config SH_FPU
-        bool "FPU support"
-        default y
-
-config SH64_FPU_DENORM_FLUSH
-        depends on SH_FPU
-        bool "Flush floating point denorms to zero"
-
-choice
-        prompt "Page table levels"
-        default SH64_PGTABLE_2_LEVEL
-
-config SH64_PGTABLE_2_LEVEL
-        bool "2"
-
-config SH64_PGTABLE_3_LEVEL
-        bool "3"
-
-endchoice
-
-choice
-        prompt "HugeTLB page size"
-        depends on HUGETLB_PAGE && MMU
-        default HUGETLB_PAGE_SIZE_64K
-
-config HUGETLB_PAGE_SIZE_64K
-        bool "64K"
-
-config HUGETLB_PAGE_SIZE_1MB
-        bool "1MB"
-
-config HUGETLB_PAGE_SIZE_512MB
-        bool "512MB"
-
-endchoice
-
-config SH64_USER_MISALIGNED_FIXUP
-        bool "Fixup misaligned loads/stores occurring in user mode"
-
-comment "Memory options"
-
-config CACHED_MEMORY_OFFSET
-        hex "Cached Area Offset"
-        default "20000000"
-
-config MEMORY_START
-        hex "Physical memory start address"
-        default "80000000"
-
-config MEMORY_SIZE_IN_MB
-        int "Memory size (in MB)"
-        default "8" if SH_SIMULATOR
-        default "64"
-
-comment "Cache options"
-
-choice
-        prompt "DCache mode"
-        default DCACHE_DISABLED if SH_SIMULATOR
-        default DCACHE_WRITE_BACK
-
-config DCACHE_WRITE_BACK
-        bool "Write-back"
-        depends on !SH_SIMULATOR
-
-config DCACHE_WRITE_THROUGH
-        bool "Write-through"
-        depends on !SH_SIMULATOR
-
-config DCACHE_DISABLED
-        bool "Disabled"
-
-endchoice
-
-config ICACHE_DISABLED
-        bool "ICache Disabling"
-
-config PCIDEVICE_MEMORY_START
-        hex
-        default "C0000000"
-
-config DEVICE_MEMORY_START
-        hex
-        default "E0000000"
-
-config FLASH_MEMORY_START
-        hex "Flash memory/on-chip devices start address"
-        default "00000000"
-
-config PCI_BLOCK_START
-        hex "PCI block start address"
-        default "40000000"
-
-comment "CPU Subtype specific options"
-
-config SH64_ID2815_WORKAROUND
-        bool "Include workaround for SH5-101 cut2 silicon defect ID2815"
-
-comment "Misc options"
-
-config HEARTBEAT
-        bool "Heartbeat LED"
-        depends on SH_CAYMAN
-
-config HDSP253_LED
-        bool "Support for HDSP-253 LED"
-        depends on SH_CAYMAN
-
-config SH_DMA
-        tristate "DMA controller (DMAC) support"
-
-config PREEMPT
-        bool "Preemptible Kernel (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
-
-source "mm/Kconfig"
-
-endmenu
-
-menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
-
-config ISA
-        bool
-
-config SBUS
-        bool
-
-config PCI
-        bool "PCI support"
-        depends on SH_CAYMAN
-        help
-          Find out whether you have a PCI motherboard. PCI is the name of a
-          bus system, i.e. the way the CPU talks to the other stuff inside
-          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
-          VESA. If you have PCI, say Y, otherwise N.
-
-          The PCI-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>, contains valuable
-          information about which PCI hardware does work under Linux and which
-          doesn't.
-
-config SH_PCIDMA_NONCOHERENT
-        bool "Cache and PCI noncoherent"
-        depends on PCI
-        default y
-        help
-          Enable this option if your platform does not have a CPU cache which
-          remains coherent with PCI DMA. It is safest to say 'Y', although you
-          will see better performance if you can say 'N', because the PCI DMA
-          code will not have to flush the CPU's caches. If you have a PCI host
-          bridge integrated with your SH CPU, refer carefully to the chip specs
-          to see if you can say 'N' here. Otherwise, leave it as 'Y'.
-
-source "drivers/pci/Kconfig"
-
-source "drivers/pcmcia/Kconfig"
-
-source "drivers/pci/hotplug/Kconfig"
-
-endmenu
-
-menu "Executable file formats"
-
-source "fs/Kconfig.binfmt"
-
-endmenu
-
-source "net/Kconfig"
-
-source "drivers/Kconfig"
-
-source "fs/Kconfig"
-
-source "kernel/Kconfig.instrumentation"
-
-source "arch/sh64/Kconfig.debug"
-
-source "security/Kconfig"
-
-source "crypto/Kconfig"
-
-source "lib/Kconfig"
diff --git a/arch/sh64/Kconfig.debug b/arch/sh64/Kconfig.debug
deleted file mode 100644
index 05c07c4e4ed6..000000000000
--- a/arch/sh64/Kconfig.debug
+++ /dev/null
@@ -1,33 +0,0 @@
-menu "Kernel hacking"
-
-source "lib/Kconfig.debug"
-
-config EARLY_PRINTK
-        bool "Early SCIF console support"
-
-config SH64_PROC_TLB
-        bool "Debug: report TLB fill/purge activity through /proc/tlb"
-        depends on PROC_FS
-
-config SH64_PROC_ASIDS
-        bool "Debug: report ASIDs through /proc/asids"
-        depends on PROC_FS
-
-config SH64_SR_WATCH
-        bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"
-
-config POOR_MANS_STRACE
-        bool "Debug: enable rudimentary strace facility"
-        help
-          This option allows system calls to be traced to the console.  It also
-          aids in detecting kernel stack underflow.  It is useful for debugging
-          early-userland problems (e.g. init incurring fatal exceptions.)
-
-config SH_ALPHANUMERIC
-        bool "Enable debug outputs to on-board alphanumeric display"
-        depends on SH_CAYMAN
-
-config SH_NO_BSS_INIT
-        bool "Avoid zeroing BSS (to speed-up startup on suitable platforms)"
-
-endmenu
diff --git a/arch/sh64/Makefile b/arch/sh64/Makefile
deleted file mode 100644
index 8dac7e1a2be6..000000000000
--- a/arch/sh64/Makefile
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 2000, 2001  Paolo Alberelli
-# Copyright (C) 2003, 2004  Paul Mundt
-#
-# This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture
-#
-
-cpu-y                           := -mb
-cpu-$(CONFIG_LITTLE_ENDIAN)     := -ml
-
-cpu-$(CONFIG_CPU_SH5)           += -m5-32media-nofpu
-
-ifdef CONFIG_LITTLE_ENDIAN
-LDFLAGS_vmlinux         += --defsym 'jiffies=jiffies_64'
-LDFLAGS                 += -EL  -mshlelf32_linux
-else
-LDFLAGS_vmlinux         += --defsym 'jiffies=jiffies_64+4'
-LDFLAGS                 += -EB  -mshelf32_linux
-endif
-
-# No requirements for endianess support from AFLAGS, 'as' always run through gcc
-KBUILD_CFLAGS           += $(cpu-y)
-
-LDFLAGS_vmlinux += --defsym phys_stext=_stext-$(CONFIG_CACHED_MEMORY_OFFSET) \
-                  --defsym phys_stext_shmedia=phys_stext+1 \
-                  -e phys_stext_shmedia
-
-OBJCOPYFLAGS    := -O binary -R .note -R .comment -R .stab -R .stabstr -S
-
-#
-# arch/sh64/defconfig never had any hope of being
-# frequently updated, so use one that does
-#
-KBUILD_DEFCONFIG        := cayman_defconfig
-
-KBUILD_IMAGE            := arch/$(ARCH)/boot/zImage
-
-ifdef LOADADDR
-LINKFLAGS     += -Ttext $(word 1,$(LOADADDR))
-endif
-
-machine-$(CONFIG_SH_CAYMAN)     := cayman
-machine-$(CONFIG_SH_SIMULATOR)  := sim
-machine-$(CONFIG_SH_HARP)       := harp
-
-head-y := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
-
-core-y  += arch/sh64/kernel/ arch/sh64/mm/
-
-ifneq ($(machine-y),)
-core-y  += arch/sh64/mach-$(machine-y)/
-endif
-
-LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
-libs-y  += arch/$(ARCH)/lib/ $(LIBGCC)
-
-drivers-$(CONFIG_OPROFILE)      += arch/sh64/oprofile/
-
-boot := arch/$(ARCH)/boot
-
-zImage: vmlinux
-        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
-
-compressed: zImage
-
-archclean:
-        $(Q)$(MAKE) $(clean)=$(boot)
-
-archprepare: arch/$(ARCH)/lib/syscalltab.h
-
-define filechk_gen-syscalltab
-       (set -e; \
-        echo "/*"; \
-        echo " * DO NOT MODIFY."; \
-        echo " *"; \
-        echo " * This file was generated by arch/$(ARCH)/Makefile"; \
-        echo " * Any changes will be reverted at build time."; \
-        echo " */"; \
-        echo ""; \
-        echo "#ifndef __SYSCALLTAB_H"; \
-        echo "#define __SYSCALLTAB_H"; \
-        echo ""; \
-        echo "#include <linux/kernel.h>"; \
-        echo ""; \
-        echo "struct syscall_info {"; \
-        echo "  const char *name;"; \
-        echo "} syscall_info_table[] = {"; \
-        sed -e '/^.*\.long /!d;s//    { "/;s/\(\([^/]*\)\/\)\{1\}.*/\2/; \
-                s/[ \t]*$$//g;s/$$/" },/;s/\("\)sys_/\1/g'; \
-        echo "};"; \
-        echo ""; \
-        echo "#define NUM_SYSCALL_INFO_ENTRIES  ARRAY_SIZE(syscall_info_table)"; \
-        echo ""; \
-        echo "#endif /* __SYSCALLTAB_H */" )
-endef
-
-arch/$(ARCH)/lib/syscalltab.h: arch/sh64/kernel/syscalls.S
-        $(call filechk,gen-syscalltab)
-
-CLEAN_FILES += arch/$(ARCH)/lib/syscalltab.h
-
-define archhelp
-        @echo '* zImage                    - Compressed kernel image'
-endef
diff --git a/arch/sh64/boot/Makefile b/arch/sh64/boot/Makefile
deleted file mode 100644
index fb71087b7b8a..000000000000
--- a/arch/sh64/boot/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# arch/sh64/boot/Makefile
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 2002 Stuart Menefy
-#
-
-targets := zImage
-subdir- := compressed
-
-$(obj)/zImage: $(obj)/compressed/vmlinux FORCE
-        $(call if_changed,objcopy)
-        @echo 'Kernel: $@ is ready'
-
-$(obj)/compressed/vmlinux: FORCE
-        $(Q)$(MAKE) $(build)=$(obj)/compressed $@
-
diff --git a/arch/sh64/boot/compressed/cache.c b/arch/sh64/boot/compressed/cache.c
deleted file mode 100644
index 708707355ffa..000000000000
--- a/arch/sh64/boot/compressed/cache.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * arch/shmedia/boot/compressed/cache.c -- simple cache management functions
- *
- * Code extracted from sh-ipl+g, sh-stub.c, which has the copyright:
- *
- *   This is originally based on an m68k software stub written by Glenn
- *   Engel at HP, but has changed quite a bit.
- *
- *   Modifications for the SH by Ben Lee and Steve Chamberlain
- *
-****************************************************************************
-
-                THIS SOFTWARE IS NOT COPYRIGHTED
-
-   HP offers the following for use in the public domain.  HP makes no
-   warranty with regard to the software or it's performance and the
-   user accepts the software "AS IS" with all faults.
-
-   HP DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD
-   TO THIS SOFTWARE INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-****************************************************************************/
-
-#define CACHE_ENABLE      0
-#define CACHE_DISABLE     1
-
-int cache_control(unsigned int command)
-{
-        volatile unsigned int *p = (volatile unsigned int *) 0x80000000;
-        int i;
-
-        for (i = 0; i < (32 * 1024); i += 32) {
-                (void *) *p;
-                p += (32 / sizeof (int));
-        }
-
-        return 0;
-}
diff --git a/arch/sh64/boot/compressed/install.sh b/arch/sh64/boot/compressed/install.sh
deleted file mode 100644
index 90589f0fec12..000000000000
--- a/arch/sh64/boot/compressed/install.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# arch/sh/boot/install.sh
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 1995 by Linus Torvalds
-#
-# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
-# Adapted from code in arch/i386/boot/install.sh by Russell King
-# Adapted from code in arch/arm/boot/install.sh by Stuart Menefy
-#
-# "make install" script for sh architecture
-#
-# Arguments:
-#   $1 - kernel version
-#   $2 - kernel image file
-#   $3 - kernel map file
-#   $4 - default install path (blank if root directory)
-#
-
-# User may have a custom install script
-
-if [ -x /sbin/installkernel ]; then
-  exec /sbin/installkernel "$@"
-fi
-
-if [ "$2" = "zImage" ]; then
-# Compressed install
-  echo "Installing compressed kernel"
-  if [ -f $4/vmlinuz-$1 ]; then
-    mv $4/vmlinuz-$1 $4/vmlinuz.old
-  fi
-
-  if [ -f $4/System.map-$1 ]; then
-    mv $4/System.map-$1 $4/System.old
-  fi
-
-  cat $2 > $4/vmlinuz-$1
-  cp $3 $4/System.map-$1
-else
-# Normal install
-  echo "Installing normal kernel"
-  if [ -f $4/vmlinux-$1 ]; then
-    mv $4/vmlinux-$1 $4/vmlinux.old
-  fi
-
-  if [ -f $4/System.map ]; then
-    mv $4/System.map $4/System.old
-  fi
-
-  cat $2 > $4/vmlinux-$1
-  cp $3 $4/System.map
-fi
diff --git a/arch/sh64/configs/harp_defconfig b/arch/sh64/configs/harp_defconfig
deleted file mode 100644
index ba302cd0c285..000000000000
--- a/arch/sh64/configs/harp_defconfig
+++ /dev/null
@@ -1,745 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rc1
-# Fri Nov  2 14:35:57 2007
-#
-CONFIG_SUPERH=y
-CONFIG_SUPERH64=y
-CONFIG_MMU=y
-CONFIG_QUICKLIST=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_NO_VIRT_TO_BUS=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-# CONFIG_SYSVIPC is not set
-CONFIG_POSIX_MQUEUE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_FAIR_USER_SCHED=y
-# CONFIG_FAIR_CGROUP_SCHED is not set
-CONFIG_SYSFS_DEPRECATED=y
-# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-# CONFIG_EMBEDDED is not set
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_MODULES is not set
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-# CONFIG_BLK_DEV_BSG is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-
-#
-# System type
-#
-# CONFIG_SH_SIMULATOR is not set
-# CONFIG_SH_CAYMAN is not set
-CONFIG_SH_HARP=y
-CONFIG_CPU_SH5=y
-CONFIG_CPU_SUBTYPE_SH5_101=y
-# CONFIG_CPU_SUBTYPE_SH5_103 is not set
-CONFIG_LITTLE_ENDIAN=y
-# CONFIG_BIG_ENDIAN is not set
-CONFIG_SH_FPU=y
-# CONFIG_SH64_FPU_DENORM_FLUSH is not set
-CONFIG_SH64_PGTABLE_2_LEVEL=y
-# CONFIG_SH64_PGTABLE_3_LEVEL is not set
-CONFIG_HUGETLB_PAGE_SIZE_64K=y
-# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
-# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
-CONFIG_SH64_USER_MISALIGNED_FIXUP=y
-
-#
-# Memory options
-#
-CONFIG_CACHED_MEMORY_OFFSET=0x20000000
-CONFIG_MEMORY_START=0x80000000
-CONFIG_MEMORY_SIZE_IN_MB=128
-
-#
-# Cache options
-#
-CONFIG_DCACHE_WRITE_BACK=y
-# CONFIG_DCACHE_WRITE_THROUGH is not set
-# CONFIG_DCACHE_DISABLED is not set
-# CONFIG_ICACHE_DISABLED is not set
-CONFIG_PCIDEVICE_MEMORY_START=C0000000
-CONFIG_DEVICE_MEMORY_START=E0000000
-CONFIG_FLASH_MEMORY_START=0x00000000
-CONFIG_PCI_BLOCK_START=0x40000000
-
-#
-# CPU Subtype specific options
-#
-CONFIG_SH64_ID2815_WORKAROUND=y
-
-#
-# Misc options
-#
-# CONFIG_SH_DMA is not set
-CONFIG_PREEMPT=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_NR_QUICK=1
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCCARD is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
-# CONFIG_INET_LRO is not set
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CONNECTOR is not set
-# CONFIG_MTD is not set
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_NETLINK is not set
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_SCH is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_ATA is not set
-# CONFIG_MD is not set
-CONFIG_NETDEVICES=y
-# CONFIG_NETDEVICES_MULTIQUEUE is not set
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-# CONFIG_VETH is not set
-# CONFIG_PHYLIB is not set
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_STNIC is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMC911X is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_B44 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEV_10000=y
-
-#
-# Wireless LAN
-#
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_ISDN is not set
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=2
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_R3964 is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_SM501 is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_DVB_CORE is not set
-CONFIG_DAB=y
-
-#
-# Graphics support
-#
-# CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-CONFIG_FB_MODE_HELPERS=y
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
-# CONFIG_LOGO_SUPERH_MONO is not set
-# CONFIG_LOGO_SUPERH_VGA16 is not set
-CONFIG_LOGO_SUPERH_CLUT224=y
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HIDRAW is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-# CONFIG_MMC is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_RTC_CLASS is not set
-
-#
-# Userspace I/O
-#
-# CONFIG_UIO is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
-# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-CONFIG_MINIX_FS=y
-CONFIG_ROMFS_FS=y
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-# CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_NLS is not set
-# CONFIG_DLM is not set
-CONFIG_INSTRUMENTATION=y
-# CONFIG_PROFILING is not set
-# CONFIG_MARKERS is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_FORCED_INLINING=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_EARLY_PRINTK is not set
-CONFIG_SH64_PROC_TLB=y
-CONFIG_SH64_PROC_ASIDS=y
-CONFIG_SH64_SR_WATCH=y
-# CONFIG_POOR_MANS_STRACE is not set
-# CONFIG_SH_NO_BSS_INIT is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
diff --git a/arch/sh64/configs/sim_defconfig b/arch/sh64/configs/sim_defconfig
deleted file mode 100644
index 18476cc522c3..000000000000
--- a/arch/sh64/configs/sim_defconfig
+++ /dev/null
@@ -1,558 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rc1
-# Fri Nov  2 14:36:08 2007
-#
-CONFIG_SUPERH=y
-CONFIG_SUPERH64=y
-CONFIG_MMU=y
-CONFIG_QUICKLIST=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_NO_VIRT_TO_BUS=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-# CONFIG_SYSVIPC is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_USER_NS is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_FAIR_USER_SCHED=y
-# CONFIG_FAIR_CGROUP_SCHED is not set
-CONFIG_SYSFS_DEPRECATED=y
-# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-# CONFIG_EMBEDDED is not set
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_MODULES is not set
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-# CONFIG_BLK_DEV_BSG is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-
-#
-# System type
-#
-CONFIG_SH_SIMULATOR=y
-# CONFIG_SH_CAYMAN is not set
-# CONFIG_SH_HARP is not set
-CONFIG_CPU_SH5=y
-CONFIG_CPU_SUBTYPE_SH5_101=y
-# CONFIG_CPU_SUBTYPE_SH5_103 is not set
-CONFIG_LITTLE_ENDIAN=y
-# CONFIG_BIG_ENDIAN is not set
-CONFIG_SH_FPU=y
-# CONFIG_SH64_FPU_DENORM_FLUSH is not set
-CONFIG_SH64_PGTABLE_2_LEVEL=y
-# CONFIG_SH64_PGTABLE_3_LEVEL is not set
-CONFIG_HUGETLB_PAGE_SIZE_64K=y
-# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
-# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
-CONFIG_SH64_USER_MISALIGNED_FIXUP=y
-
-#
-# Memory options
-#
-CONFIG_CACHED_MEMORY_OFFSET=0x20000000
-CONFIG_MEMORY_START=0x80000000
-CONFIG_MEMORY_SIZE_IN_MB=128
-
-#
-# Cache options
-#
-# CONFIG_DCACHE_WRITE_BACK is not set
-# CONFIG_DCACHE_WRITE_THROUGH is not set
-CONFIG_DCACHE_DISABLED=y
-# CONFIG_ICACHE_DISABLED is not set
-CONFIG_PCIDEVICE_MEMORY_START=C0000000
-CONFIG_DEVICE_MEMORY_START=E0000000
-CONFIG_FLASH_MEMORY_START=0x00000000
-CONFIG_PCI_BLOCK_START=0x40000000
-
-#
-# CPU Subtype specific options
-#
-CONFIG_SH64_ID2815_WORKAROUND=y
-
-#
-# Misc options
-#
-# CONFIG_SH_DMA is not set
-CONFIG_PREEMPT=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_NR_QUICK=1
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCCARD is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Networking
-#
-# CONFIG_NET is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_MTD is not set
-# CONFIG_PARPORT is not set
-# CONFIG_BLK_DEV is not set
-# CONFIG_MISC_DEVICES is not set
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_NETLINK is not set
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_SCH is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_ATA is not set
-# CONFIG_MD is not set
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=2
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_R3964 is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_HWMON is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_SM501 is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-CONFIG_DAB=y
-
-#
-# Graphics support
-#
-# CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-CONFIG_FB_MODE_HELPERS=y
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
-# CONFIG_LOGO_SUPERH_MONO is not set
-# CONFIG_LOGO_SUPERH_VGA16 is not set
-CONFIG_LOGO_SUPERH_CLUT224=y
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_MMC is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_RTC_CLASS is not set
-
-#
-# Userspace I/O
-#
-# CONFIG_UIO is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
-# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-CONFIG_MINIX_FS=y
-CONFIG_ROMFS_FS=y
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-# CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_NLS is not set
-CONFIG_INSTRUMENTATION=y
-CONFIG_PROFILING=y
-# CONFIG_OPROFILE is not set
-# CONFIG_MARKERS is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_FORCED_INLINING=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_EARLY_PRINTK is not set
-CONFIG_SH64_PROC_TLB=y
-CONFIG_SH64_PROC_ASIDS=y
-CONFIG_SH64_SR_WATCH=y
-# CONFIG_POOR_MANS_STRACE is not set
-CONFIG_SH_NO_BSS_INIT=y
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
diff --git a/arch/sh64/kernel/Makefile b/arch/sh64/kernel/Makefile
deleted file mode 100644
index e3467bda6167..000000000000
--- a/arch/sh64/kernel/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 2000, 2001  Paolo Alberelli
-# Copyright (C) 2003  Paul Mundt
-#
-# Makefile for the Linux sh64 kernel.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-extra-y := head.o init_task.o vmlinux.lds
-
-obj-y   := process.o signal.o entry.o traps.o irq.o irq_intc.o \
-           ptrace.o setup.o time.o sys_sh64.o semaphore.o sh_ksyms.o \
-           switchto.o syscalls.o
-
-obj-$(CONFIG_HEARTBEAT)         += led.o
-obj-$(CONFIG_SH_ALPHANUMERIC)   += alphanum.o
-obj-$(CONFIG_SH_DMA)            += dma.o
-obj-$(CONFIG_SH_FPU)            += fpu.o
-obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
-obj-$(CONFIG_KALLSYMS)          += unwind.o
-obj-$(CONFIG_PCI)               += pcibios.o
-obj-$(CONFIG_MODULES)           += module.o
-
-ifeq ($(CONFIG_PCI),y)
-obj-$(CONFIG_CPU_SH5)           += pci_sh5.o
-endif
-
-USE_STANDARD_AS_RULE := true
-
diff --git a/arch/sh64/kernel/alphanum.c b/arch/sh64/kernel/alphanum.c
deleted file mode 100644
index d1619d95fbaa..000000000000
--- a/arch/sh64/kernel/alphanum.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * arch/sh64/kernel/alphanum.c
- *
- * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine-independent functions for handling 8-digit alphanumeric display
- * (e.g. Agilent HDSP-253x)
- */
-#include <linux/stddef.h>
-#include <linux/sched.h>
-
-void mach_alphanum(int pos, unsigned char val);
-
-void print_seg(char *file, int line)
-{
-        int i;
-        unsigned int nibble;
-
-        for (i = 0; i < 5; i++) {
-                mach_alphanum(i, file[i]);
-        }
-
-        for (i = 0; i < 3; i++) {
-                nibble = ((line >> (i * 4)) & 0xf);
-                mach_alphanum(7 - i, nibble + ((nibble > 9) ? 55 : 48));
-        }
-}
-
-void print_seg_num(unsigned num)
-{
-        int i;
-        unsigned int nibble;
-
-        for (i = 0; i < 8; i++) {
-                nibble = ((num >> (i * 4)) & 0xf);
-
-                mach_alphanum(7 - i, nibble + ((nibble > 9) ? 55 : 48));
-        }
-}
-
diff --git a/arch/sh64/kernel/asm-offsets.c b/arch/sh64/kernel/asm-offsets.c
deleted file mode 100644
index ca76537c16c0..000000000000
--- a/arch/sh64/kernel/asm-offsets.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This program is used to generate definitions needed by
- * assembly language modules.
- *
- * We use the technique used in the OSF Mach kernel code:
- * generate asm statements containing #defines,
- * compile this file to assembler, and then extract the
- * #defines from the assembly-language output.
- */
-
-#include <linux/stddef.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <asm/thread_info.h>
-
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
-int main(void)
-{
-        /* offsets into the thread_info struct */
-        DEFINE(TI_TASK,         offsetof(struct thread_info, task));
-        DEFINE(TI_EXEC_DOMAIN,  offsetof(struct thread_info, exec_domain));
-        DEFINE(TI_FLAGS,        offsetof(struct thread_info, flags));
-        DEFINE(TI_PRE_COUNT,    offsetof(struct thread_info, preempt_count));
-        DEFINE(TI_CPU,          offsetof(struct thread_info, cpu));
-        DEFINE(TI_ADDR_LIMIT,   offsetof(struct thread_info, addr_limit));
-        DEFINE(TI_RESTART_BLOCK,offsetof(struct thread_info, restart_block));
-
-        return 0;
-}
diff --git a/arch/sh64/kernel/dma.c b/arch/sh64/kernel/dma.c
deleted file mode 100644
index 32c6f0549bf1..000000000000
--- a/arch/sh64/kernel/dma.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * arch/sh64/kernel/dma.c
- *
- * DMA routines for the SH-5 DMAC.
- *
- * Copyright (C) 2003  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/types.h>
-#include <linux/irq.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <asm/hardware.h>
-#include <asm/dma.h>
-#include <asm/signal.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-
-typedef struct {
-        unsigned long dev_addr;
-        unsigned long mem_addr;
-
-        unsigned int mode;
-        unsigned int count;
-} dma_info_t;
-
-static dma_info_t dma_info[MAX_DMA_CHANNELS];
-static DEFINE_SPINLOCK(dma_spin_lock);
-
-/* arch/sh64/kernel/irq_intc.c */
-extern void make_intc_irq(unsigned int irq);
-
-/* DMAC Interrupts */
-#define DMA_IRQ_DMTE0   18
-#define DMA_IRQ_DERR    22
-
-#define DMAC_COMMON_BASE        (dmac_base + 0x08)
-#define DMAC_SAR_BASE           (dmac_base + 0x10)
-#define DMAC_DAR_BASE           (dmac_base + 0x18)
-#define DMAC_COUNT_BASE         (dmac_base + 0x20)
-#define DMAC_CTRL_BASE          (dmac_base + 0x28)
-#define DMAC_STATUS_BASE        (dmac_base + 0x30)
-
-#define DMAC_SAR(n)     (DMAC_SAR_BASE    + ((n) * 0x28))
-#define DMAC_DAR(n)     (DMAC_DAR_BASE    + ((n) * 0x28))
-#define DMAC_COUNT(n)   (DMAC_COUNT_BASE  + ((n) * 0x28))
-#define DMAC_CTRL(n)    (DMAC_CTRL_BASE   + ((n) * 0x28))
-#define DMAC_STATUS(n)  (DMAC_STATUS_BASE + ((n) * 0x28))
-
-/* DMAC.COMMON Bit Definitions */
-#define DMAC_COMMON_PR  0x00000001      /* Priority */
-                                        /* Bits 1-2 Reserved */
-#define DMAC_COMMON_ME  0x00000008      /* Master Enable */
-#define DMAC_COMMON_NMI 0x00000010      /* NMI Flag */
-                                        /* Bits 5-6 Reserved */
-#define DMAC_COMMON_ER  0x00000780      /* Error Response */
-#define DMAC_COMMON_AAE 0x00007800      /* Address Alignment Error */
-                                        /* Bits 15-63 Reserved */
-
-/* DMAC.SAR Bit Definitions */
-#define DMAC_SAR_ADDR   0xffffffff      /* Source Address */
-
-/* DMAC.DAR Bit Definitions */
-#define DMAC_DAR_ADDR   0xffffffff      /* Destination Address */
-
-/* DMAC.COUNT Bit Definitions */
-#define DMAC_COUNT_CNT  0xffffffff      /* Transfer Count */
-
-/* DMAC.CTRL Bit Definitions */
-#define DMAC_CTRL_TS    0x00000007      /* Transfer Size */
-#define DMAC_CTRL_SI    0x00000018      /* Source Increment */
-#define DMAC_CTRL_DI    0x00000060      /* Destination Increment */
-#define DMAC_CTRL_RS    0x00000780      /* Resource Select */
-#define DMAC_CTRL_IE    0x00000800      /* Interrupt Enable */
-#define DMAC_CTRL_TE    0x00001000      /* Transfer Enable */
-                                        /* Bits 15-63 Reserved */
-
-/* DMAC.STATUS Bit Definitions */
-#define DMAC_STATUS_TE  0x00000001      /* Transfer End */
-#define DMAC_STATUS_AAE 0x00000002      /* Address Alignment Error */
-                                        /* Bits 2-63 Reserved */
-
-static unsigned long dmac_base;
-
-void set_dma_count(unsigned int chan, unsigned int count);
-void set_dma_addr(unsigned int chan, unsigned int addr);
-
-static irqreturn_t dma_mte(int irq, void *dev_id, struct pt_regs *regs)
-{
-        unsigned int chan = irq - DMA_IRQ_DMTE0;
-        dma_info_t *info = dma_info + chan;
-        u64 status;
-
-        if (info->mode & DMA_MODE_WRITE) {
-                sh64_out64(info->mem_addr & DMAC_SAR_ADDR, DMAC_SAR(chan));
-        } else {
-                sh64_out64(info->mem_addr & DMAC_DAR_ADDR, DMAC_DAR(chan));
-        }
-
-        set_dma_count(chan, info->count);
-
-        /* Clear the TE bit */
-        status = sh64_in64(DMAC_STATUS(chan));
-        status &= ~DMAC_STATUS_TE;
-        sh64_out64(status, DMAC_STATUS(chan));
-
-        return IRQ_HANDLED;
-}
-
-static struct irqaction irq_dmte = {
-        .handler        = dma_mte,
-        .flags          = IRQF_DISABLED,
-        .name           = "DMA MTE",
-};
-
-static irqreturn_t dma_err(int irq, void *dev_id, struct pt_regs *regs)
-{
-        u64 tmp;
-        u8 chan;
-
-        printk(KERN_NOTICE "DMAC: Got a DMA Error!\n");
-
-        tmp = sh64_in64(DMAC_COMMON_BASE);
-
-        /* Check for the type of error */
-        if ((chan = tmp & DMAC_COMMON_AAE)) {
-                /* It's an address alignment error.. */
-                printk(KERN_NOTICE "DMAC: Alignment error on channel %d, ", chan);
-
-                printk(KERN_NOTICE "SAR: 0x%08llx, DAR: 0x%08llx, COUNT: %lld\n",
-                       (sh64_in64(DMAC_SAR(chan)) & DMAC_SAR_ADDR),
-                       (sh64_in64(DMAC_DAR(chan)) & DMAC_DAR_ADDR),
-                       (sh64_in64(DMAC_COUNT(chan)) & DMAC_COUNT_CNT));
-
-        } else if ((chan = tmp & DMAC_COMMON_ER)) {
-                /* Something else went wrong.. */
-                printk(KERN_NOTICE "DMAC: Error on channel %d\n", chan);
-        }
-
-        /* Reset the ME bit to clear the interrupt */
-        tmp |= DMAC_COMMON_ME;
-        sh64_out64(tmp, DMAC_COMMON_BASE);
-
-        return IRQ_HANDLED;
-}
-
-static struct irqaction irq_derr = {
-        .handler        = dma_err,
-        .flags          = IRQF_DISABLED,
-        .name           = "DMA Error",
-};
-
-static inline unsigned long calc_xmit_shift(unsigned int chan)
-{
-        return sh64_in64(DMAC_CTRL(chan)) & 0x03;
-}
-
-void setup_dma(unsigned int chan, dma_info_t *info)
-{
-        unsigned int irq = DMA_IRQ_DMTE0 + chan;
-        dma_info_t *dma = dma_info + chan;
-
-        make_intc_irq(irq);
-        setup_irq(irq, &irq_dmte);
-        dma = info;
-}
-
-void enable_dma(unsigned int chan)
-{
-        u64 ctrl;
-
-        ctrl = sh64_in64(DMAC_CTRL(chan));
-        ctrl |= DMAC_CTRL_TE;
-        sh64_out64(ctrl, DMAC_CTRL(chan));
-}
-
-void disable_dma(unsigned int chan)
-{
-        u64 ctrl;
-
-        ctrl = sh64_in64(DMAC_CTRL(chan));
-        ctrl &= ~DMAC_CTRL_TE;
-        sh64_out64(ctrl, DMAC_CTRL(chan));
-}
-
-void set_dma_mode(unsigned int chan, char mode)
-{
-        dma_info_t *info = dma_info + chan;
-
-        info->mode = mode;
-
-        set_dma_addr(chan, info->mem_addr);
-        set_dma_count(chan, info->count);
-}
-
-void set_dma_addr(unsigned int chan, unsigned int addr)
-{
-        dma_info_t *info = dma_info + chan;
-        unsigned long sar, dar;
-
-        info->mem_addr = addr;
-        sar = (info->mode & DMA_MODE_WRITE) ? info->mem_addr : info->dev_addr;
-        dar = (info->mode & DMA_MODE_WRITE) ? info->dev_addr : info->mem_addr;
-
-        sh64_out64(sar & DMAC_SAR_ADDR, DMAC_SAR(chan));
-        sh64_out64(dar & DMAC_SAR_ADDR, DMAC_DAR(chan));
-}
-
-void set_dma_count(unsigned int chan, unsigned int count)
-{
-        dma_info_t *info = dma_info + chan;
-        u64 tmp;
-
-        info->count = count;
-
-        tmp = (info->count >> calc_xmit_shift(chan)) & DMAC_COUNT_CNT;
-
-        sh64_out64(tmp, DMAC_COUNT(chan));
-}
-
-unsigned long claim_dma_lock(void)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&dma_spin_lock, flags);
-
-        return flags;
-}
-
-void release_dma_lock(unsigned long flags)
-{
-        spin_unlock_irqrestore(&dma_spin_lock, flags);
-}
-
-int get_dma_residue(unsigned int chan)
-{
-        return sh64_in64(DMAC_COUNT(chan) << calc_xmit_shift(chan));
-}
-
-int __init init_dma(void)
-{
-        struct vcr_info vcr;
-        u64 tmp;
-
-        /* Remap the DMAC */
-        dmac_base = onchip_remap(PHYS_DMAC_BLOCK, 1024, "DMAC");
-        if (!dmac_base) {
-                printk(KERN_ERR "Unable to remap DMAC\n");
-                return -ENOMEM;
-        }
-
-        /* Report DMAC.VCR Info */
-        vcr = sh64_get_vcr_info(dmac_base);
-        printk("DMAC: Module ID: 0x%04x, Module version: 0x%04x\n",
-               vcr.mod_id, vcr.mod_vers);
-
-        /* Set the ME bit */
-        tmp = sh64_in64(DMAC_COMMON_BASE);
-        tmp |= DMAC_COMMON_ME;
-        sh64_out64(tmp, DMAC_COMMON_BASE);
-
-        /* Enable the DMAC Error Interrupt */
-        make_intc_irq(DMA_IRQ_DERR);
-        setup_irq(DMA_IRQ_DERR, &irq_derr);
-
-        return 0;
-}
-
-static void __exit exit_dma(void)
-{
-        onchip_unmap(dmac_base);
-        free_irq(DMA_IRQ_DERR, 0);
-}
-
-module_init(init_dma);
-module_exit(exit_dma);
-
-MODULE_AUTHOR("Paul Mundt");
-MODULE_DESCRIPTION("DMA API for SH-5 DMAC");
-MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(setup_dma);
-EXPORT_SYMBOL(claim_dma_lock);
-EXPORT_SYMBOL(release_dma_lock);
-EXPORT_SYMBOL(enable_dma);
-EXPORT_SYMBOL(disable_dma);
-EXPORT_SYMBOL(set_dma_mode);
-EXPORT_SYMBOL(set_dma_addr);
-EXPORT_SYMBOL(set_dma_count);
-EXPORT_SYMBOL(get_dma_residue);
-
diff --git a/arch/sh64/kernel/early_printk.c b/arch/sh64/kernel/early_printk.c
deleted file mode 100644
index 4f9131123672..000000000000
--- a/arch/sh64/kernel/early_printk.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * arch/sh64/kernel/early_printk.c
- *
- * SH-5 Early SCIF console (cloned and hacked from sh implementation)
- *
- * Copyright (C) 2003, 2004  Paul Mundt <lethal@linux-sh.org>
- * Copyright (C) 2002  M. R. Brown <mrbrown@0xd6.org>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/console.h>
-#include <linux/tty.h>
-#include <linux/init.h>
-#include <asm/io.h>
-#include <asm/hardware.h>
-
-#define SCIF_BASE_ADDR  0x01030000
-#define SCIF_ADDR_SH5   PHYS_PERIPHERAL_BLOCK+SCIF_BASE_ADDR
-
-/*
- * Fixed virtual address where SCIF is mapped (should already be done
- * in arch/sh64/kernel/head.S!).
- */
-#define SCIF_REG        0xfa030000
-
-enum {
-        SCIF_SCSMR2     = SCIF_REG + 0x00,
-        SCIF_SCBRR2     = SCIF_REG + 0x04,
-        SCIF_SCSCR2     = SCIF_REG + 0x08,
-        SCIF_SCFTDR2    = SCIF_REG + 0x0c,
-        SCIF_SCFSR2     = SCIF_REG + 0x10,
-        SCIF_SCFRDR2    = SCIF_REG + 0x14,
-        SCIF_SCFCR2     = SCIF_REG + 0x18,
-        SCIF_SCFDR2     = SCIF_REG + 0x1c,
-        SCIF_SCSPTR2    = SCIF_REG + 0x20,
-        SCIF_SCLSR2     = SCIF_REG + 0x24,
-};
-
-static void sh_console_putc(int c)
-{
-        while (!(ctrl_inw(SCIF_SCFSR2) & 0x20))
-                cpu_relax();
-
-        ctrl_outb(c, SCIF_SCFTDR2);
-        ctrl_outw((ctrl_inw(SCIF_SCFSR2) & 0x9f), SCIF_SCFSR2);
-
-        if (c == '\n')
-                sh_console_putc('\r');
-}
-
-static void sh_console_flush(void)
-{
-        ctrl_outw((ctrl_inw(SCIF_SCFSR2) & 0xbf), SCIF_SCFSR2);
-
-        while (!(ctrl_inw(SCIF_SCFSR2) & 0x40))
-                cpu_relax();
-
-        ctrl_outw((ctrl_inw(SCIF_SCFSR2) & 0xbf), SCIF_SCFSR2);
-}
-
-static void sh_console_write(struct console *con, const char *s, unsigned count)
-{
-        while (count-- > 0)
-                sh_console_putc(*s++);
-
-        sh_console_flush();
-}
-
-static int __init sh_console_setup(struct console *con, char *options)
-{
-        con->cflag = CREAD | HUPCL | CLOCAL | B19200 | CS8;
-
-        return 0;
-}
-
-static struct console sh_console = {
-        .name           = "scifcon",
-        .write          = sh_console_write,
-        .setup          = sh_console_setup,
-        .flags          = CON_PRINTBUFFER | CON_BOOT,
-        .index          = -1,
-};
-
-void __init enable_early_printk(void)
-{
-        ctrl_outb(0x2a, SCIF_SCBRR2);   /* 19200bps */
-
-        ctrl_outw(0x04, SCIF_SCFCR2);   /* Reset TFRST */
-        ctrl_outw(0x10, SCIF_SCFCR2);   /* TTRG0=1 */
-
-        ctrl_outw(0, SCIF_SCSPTR2);
-        ctrl_outw(0x60, SCIF_SCFSR2);
-        ctrl_outw(0, SCIF_SCLSR2);
-        ctrl_outw(0x30, SCIF_SCSCR2);
-
-        register_console(&sh_console);
-}
diff --git a/arch/sh64/kernel/init_task.c b/arch/sh64/kernel/init_task.c
deleted file mode 100644
index deee8bfd3270..000000000000
--- a/arch/sh64/kernel/init_task.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/init_task.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-#include <linux/rwsem.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/init_task.h>
-#include <linux/mqueue.h>
-#include <linux/fs.h>
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-
-static struct fs_struct init_fs = INIT_FS;
-static struct files_struct init_files = INIT_FILES;
-static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
-static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-struct mm_struct init_mm = INIT_MM(init_mm);
-
-struct pt_regs fake_swapper_regs;
-
-/*
- * Initial thread structure.
- *
- * We need to make sure that this is THREAD_SIZE-byte aligned due
- * to the way process stacks are handled. This is done by having a
- * special "init_task" linker map entry..
- */
-union thread_union init_thread_union
-        __attribute__((__section__(".data.init_task"))) =
-                { INIT_THREAD_INFO(init_task) };
-
-/*
- * Initial task structure.
- *
- * All other task structs will be allocated on slabs in fork.c
- */
-struct task_struct init_task = INIT_TASK(init_task);
-
diff --git a/arch/sh64/kernel/irq.c b/arch/sh64/kernel/irq.c
deleted file mode 100644
index 9412b7166700..000000000000
--- a/arch/sh64/kernel/irq.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/irq.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-/*
- * IRQs are in fact implemented a bit like signal handlers for the kernel.
- * Naturally it's not a 1:1 relation, but there are similarities.
- */
-
-#include <linux/errno.h>
-#include <linux/kernel_stat.h>
-#include <linux/signal.h>
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/smp.h>
-#include <linux/init.h>
-#include <linux/seq_file.h>
-#include <linux/bitops.h>
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/smp.h>
-#include <asm/pgalloc.h>
-#include <asm/delay.h>
-#include <asm/irq.h>
-#include <linux/irq.h>
-
-void ack_bad_irq(unsigned int irq)
-{
-        printk("unexpected IRQ trap at irq %02x\n", irq);
-}
-
-#if defined(CONFIG_PROC_FS)
-int show_interrupts(struct seq_file *p, void *v)
-{
-        int i = *(loff_t *) v, j;
-        struct irqaction * action;
-        unsigned long flags;
-
-        if (i == 0) {
-                seq_puts(p, "           ");
-                for_each_online_cpu(j)
-                        seq_printf(p, "CPU%d       ",j);
-                seq_putc(p, '\n');
-        }
-
-        if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
-                action = irq_desc[i].action;
-                if (!action)
-                        goto unlock;
-                seq_printf(p, "%3d: ",i);
-                seq_printf(p, "%10u ", kstat_irqs(i));
-                seq_printf(p, " %14s", irq_desc[i].chip->typename);
-                seq_printf(p, "  %s", action->name);
-
-                for (action=action->next; action; action = action->next)
-                        seq_printf(p, ", %s", action->name);
-                seq_putc(p, '\n');
-unlock:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
-        }
-        return 0;
-}
-#endif
-
-/*
- * do_NMI handles all Non-Maskable Interrupts.
- */
-asmlinkage void do_NMI(unsigned long vector_num, struct pt_regs * regs)
-{
-        if (regs->sr & 0x40000000)
-                printk("unexpected NMI trap in system mode\n");
-        else
-                printk("unexpected NMI trap in user mode\n");
-
-        /* No statistics */
-}
-
-/*
- * do_IRQ handles all normal device IRQ's.
- */
-asmlinkage int do_IRQ(unsigned long vector_num, struct pt_regs * regs)
-{
-        struct pt_regs *old_regs = set_irq_regs(regs);
-        int irq;
-
-        irq_enter();
-
-        irq = irq_demux(vector_num);
-
-        if (irq >= 0) {
-                __do_IRQ(irq);
-        } else {
-                printk("unexpected IRQ trap at vector %03lx\n", vector_num);
-        }
-
-        irq_exit();
-
-        set_irq_regs(old_regs);
-        return 1;
-}
-
diff --git a/arch/sh64/kernel/led.c b/arch/sh64/kernel/led.c
deleted file mode 100644
index e35d3f667fb4..000000000000
--- a/arch/sh64/kernel/led.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * arch/sh64/kernel/led.c
- *
- * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Flash the LEDs
- */
-#include <linux/stddef.h>
-#include <linux/sched.h>
-
-void mach_led(int pos, int val);
-
-/* acts like an actual heart beat -- ie thump-thump-pause... */
-void heartbeat(void)
-{
-        static unsigned int cnt = 0, period = 0, dist = 0;
-
-        if (cnt == 0 || cnt == dist) {
-                mach_led(-1, 1);
-        } else if (cnt == 7 || cnt == dist + 7) {
-                mach_led(-1, 0);
-        }
-
-        if (++cnt > period) {
-                cnt = 0;
-
-                /*
-                 * The hyperbolic function below modifies the heartbeat period
-                 * length in dependency of the current (5min) load. It goes
-                 * through the points f(0)=126, f(1)=86, f(5)=51, f(inf)->30.
-                 */
-                period = ((672 << FSHIFT) / (5 * avenrun[0] +
-                                            (7 << FSHIFT))) + 30;
-                dist = period / 4;
-        }
-}
-
diff --git a/arch/sh64/kernel/module.c b/arch/sh64/kernel/module.c
deleted file mode 100644
index 2598f6b88b44..000000000000
--- a/arch/sh64/kernel/module.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  Kernel module help for sh64.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Copyright 2004 SuperH (UK) Ltd
-    Author: Richard Curnow
-
-    Based on the sh version, and on code from the sh64-specific parts of
-    modutils, originally written by Richard Curnow and Ben Gaster.
-
-*/
-#include <linux/moduleloader.h>
-#include <linux/elf.h>
-#include <linux/vmalloc.h>
-#include <linux/fs.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(fmt...)
-#endif
-
-void *module_alloc(unsigned long size)
-{
-        if (size == 0)
-                return NULL;
-        return vmalloc(size);
-}
-
-
-/* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
-{
-        vfree(module_region);
-        /* FIXME: If module_region == mod->init_region, trim exception
-           table entries. */
-}
-
-/* We don't need anything special. */
-int module_frob_arch_sections(Elf_Ehdr *hdr,
-                              Elf_Shdr *sechdrs,
-                              char *secstrings,
-                              struct module *mod)
-{
-        return 0;
-}
-
-int apply_relocate_add(Elf32_Shdr *sechdrs,
-                   const char *strtab,
-                   unsigned int symindex,
-                   unsigned int relsec,
-                   struct module *me)
-{
-        unsigned int i;
-        Elf32_Rela *rel = (void *)sechdrs[relsec].sh_addr;
-        Elf32_Sym *sym;
-        Elf32_Addr relocation;
-        uint32_t *location;
-        int align;
-        int is_shmedia;
-
-        DEBUGP("Applying relocate section %u to %u\n", relsec,
-               sechdrs[relsec].sh_info);
-        for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
-                /* This is where to make the change */
-                location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
-                        + rel[i].r_offset;
-                /* This is the symbol it is referring to.  Note that all
-                   undefined symbols have been resolved.  */
-                sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
-                        + ELF32_R_SYM(rel[i].r_info);
-                relocation = sym->st_value + rel[i].r_addend;
-                align = (int)location & 3;
-
-                /* For text addresses, bit2 of the st_other field indicates
-                 * whether the symbol is SHmedia (1) or SHcompact (0).  If
-                 * SHmedia, the LSB of the symbol needs to be asserted
-                 * for the CPU to be in SHmedia mode when it starts executing
-                 * the branch target. */
-                is_shmedia = (sym->st_other & 4) ? 1 : 0;
-                if (is_shmedia) {
-                        relocation |= 1;
-                }
-
-                switch (ELF32_R_TYPE(rel[i].r_info)) {
-                case R_SH_DIR32:
-                        DEBUGP("R_SH_DIR32 @%08lx = %08lx\n", (unsigned long) location, (unsigned long) relocation);
-                        *location += relocation;
-                        break;
-                case R_SH_REL32:
-                        DEBUGP("R_SH_REL32 @%08lx = %08lx\n", (unsigned long) location, (unsigned long) relocation);
-                        relocation -= (Elf32_Addr) location;
-                        *location += relocation;
-                        break;
-                case R_SH_IMM_LOW16:
-                        DEBUGP("R_SH_IMM_LOW16 @%08lx = %08lx\n", (unsigned long) location, (unsigned long) relocation);
-                        *location = (*location & ~0x3fffc00) |
-                                ((relocation & 0xffff) << 10);
-                        break;
-                case R_SH_IMM_MEDLOW16:
-                        DEBUGP("R_SH_IMM_MEDLOW16 @%08lx = %08lx\n", (unsigned long) location, (unsigned long) relocation);
-                        *location = (*location & ~0x3fffc00) |
-                                (((relocation >> 16) & 0xffff) << 10);
-                        break;
-                case R_SH_IMM_LOW16_PCREL:
-                        DEBUGP("R_SH_IMM_LOW16_PCREL @%08lx = %08lx\n", (unsigned long) location, (unsigned long) relocation);
-                        relocation -= (Elf32_Addr) location;
-                        *location = (*location & ~0x3fffc00) |
-                                ((relocation & 0xffff) << 10);
-                        break;
-                case R_SH_IMM_MEDLOW16_PCREL:
-                        DEBUGP("R_SH_IMM_MEDLOW16_PCREL @%08lx = %08lx\n", (unsigned long) location, (unsigned long) relocation);
-                        relocation -= (Elf32_Addr) location;
-                        *location = (*location & ~0x3fffc00) |
-                                (((relocation >> 16) & 0xffff) << 10);
-                        break;
-                default:
-                        printk(KERN_ERR "module %s: Unknown relocation: %u\n",
-                               me->name, ELF32_R_TYPE(rel[i].r_info));
-                        return -ENOEXEC;
-                }
-        }
-        return 0;
-}
-
-int apply_relocate(Elf32_Shdr *sechdrs,
-                       const char *strtab,
-                       unsigned int symindex,
-                       unsigned int relsec,
-                       struct module *me)
-{
-        printk(KERN_ERR "module %s: REL RELOCATION unsupported\n",
-               me->name);
-        return -ENOEXEC;
-}
-
-int module_finalize(const Elf_Ehdr *hdr,
-                    const Elf_Shdr *sechdrs,
-                    struct module *me)
-{
-        return 0;
-}
-
-void module_arch_cleanup(struct module *mod)
-{
-}
-
diff --git a/arch/sh64/kernel/pci_sh5.c b/arch/sh64/kernel/pci_sh5.c
deleted file mode 100644
index b4d9534d2b0e..000000000000
--- a/arch/sh64/kernel/pci_sh5.c
+++ /dev/null
@@ -1,536 +0,0 @@
-/*
- * Copyright (C) 2001 David J. Mckay (david.mckay@st.com)
- * Copyright (C) 2003, 2004 Paul Mundt
- * Copyright (C) 2004 Richard Curnow
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Support functions for the SH5 PCI hardware.
- */
-
-#include <linux/kernel.h>
-#include <linux/rwsem.h>
-#include <linux/smp.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/types.h>
-#include <asm/pci.h>
-#include <linux/irq.h>
-
-#include <asm/io.h>
-#include <asm/hardware.h>
-#include "pci_sh5.h"
-
-static unsigned long pcicr_virt;
-unsigned long pciio_virt;
-
-static void __init pci_fixup_ide_bases(struct pci_dev *d)
-{
-        int i;
-
-        /*
-         * PCI IDE controllers use non-standard I/O port decoding, respect it.
-         */
-        if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE)
-                return;
-        printk("PCI: IDE base address fixup for %s\n", pci_name(d));
-        for(i=0; i<4; i++) {
-                struct resource *r = &d->resource[i];
-                if ((r->start & ~0x80) == 0x374) {
-                        r->start |= 2;
-                        r->end = r->start;
-                }
-        }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
-
-char * __devinit pcibios_setup(char *str)
-{
-        return str;
-}
-
-/* Rounds a number UP to the nearest power of two. Used for
- * sizing the PCI window.
- */
-static u32 __init r2p2(u32 num)
-{
-        int i = 31;
-        u32 tmp = num;
-
-        if (num == 0)
-                return 0;
-
-        do {
-                if (tmp & (1 << 31))
-                        break;
-                i--;
-                tmp <<= 1;
-        } while (i >= 0);
-
-        tmp = 1 << i;
-        /* If the original number isn't a power of 2, round it up */
-        if (tmp != num)
-                tmp <<= 1;
-
-        return tmp;
-}
-
-extern unsigned long long memory_start, memory_end;
-
-int __init sh5pci_init(unsigned memStart, unsigned memSize)
-{
-        u32 lsr0;
-        u32 uval;
-
-        pcicr_virt = onchip_remap(SH5PCI_ICR_BASE, 1024, "PCICR");
-        if (!pcicr_virt) {
-                panic("Unable to remap PCICR\n");
-        }
-
-        pciio_virt = onchip_remap(SH5PCI_IO_BASE, 0x10000, "PCIIO");
-        if (!pciio_virt) {
-                panic("Unable to remap PCIIO\n");
-        }
-
-        pr_debug("Register base addres is 0x%08lx\n", pcicr_virt);
-
-        /* Clear snoop registers */
-        SH5PCI_WRITE(CSCR0, 0);
-        SH5PCI_WRITE(CSCR1, 0);
-
-        pr_debug("Wrote to reg\n");
-
-        /* Switch off interrupts */
-        SH5PCI_WRITE(INTM,  0);
-        SH5PCI_WRITE(AINTM, 0);
-        SH5PCI_WRITE(PINTM, 0);
-
-        /* Set bus active, take it out of reset */
-        uval = SH5PCI_READ(CR);
-
-        /* Set command Register */
-        SH5PCI_WRITE(CR, uval | CR_LOCK_MASK | CR_CFINT| CR_FTO | CR_PFE | CR_PFCS | CR_BMAM);
-
-        uval=SH5PCI_READ(CR);
-        pr_debug("CR is actually 0x%08x\n",uval);
-
-        /* Allow it to be a master */
-        /* NB - WE DISABLE I/O ACCESS to stop overlap */
-        /* set WAIT bit to enable stepping, an attempt to improve stability */
-        SH5PCI_WRITE_SHORT(CSR_CMD,
-                            PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_WAIT);
-
-        /*
-        ** Set translation mapping memory in order to convert the address
-        ** used for the main bus, to the PCI internal address.
-        */
-        SH5PCI_WRITE(MBR,0x40000000);
-
-        /* Always set the max size 512M */
-        SH5PCI_WRITE(MBMR, PCISH5_MEM_SIZCONV(512*1024*1024));
-
-        /*
-        ** I/O addresses are mapped at internal PCI specific address
-        ** as is described into the configuration bridge table.
-        ** These are changed to 0, to allow cards that have legacy
-        ** io such as vga to function correctly. We set the SH5 IOBAR to
-        ** 256K, which is a bit big as we can only have 64K of address space
-        */
-
-        SH5PCI_WRITE(IOBR,0x0);
-
-        pr_debug("PCI:Writing 0x%08x to IOBR\n",0);
-
-        /* Set up a 256K window. Totally pointless waste  of address space */
-        SH5PCI_WRITE(IOBMR,0);
-        pr_debug("PCI:Writing 0x%08x to IOBMR\n",0);
-
-        /* The SH5 has a HUGE 256K I/O region, which breaks the PCI spec. Ideally,
-         * we would want to map the I/O region somewhere, but it is so big this is not
-         * that easy!
-         */
-        SH5PCI_WRITE(CSR_IBAR0,~0);
-        /* Set memory size value */
-        memSize = memory_end - memory_start;
-
-        /* Now we set up the mbars so the PCI bus can see the memory of the machine */
-        if (memSize < (1024 * 1024)) {
-                printk(KERN_ERR "PCISH5: Ridiculous memory size of 0x%x?\n", memSize);
-                return -EINVAL;
-        }
-
-        /* Set LSR 0 */
-        lsr0 = (memSize > (512 * 1024 * 1024)) ? 0x1ff00001 : ((r2p2(memSize) - 0x100000) | 0x1);
-        SH5PCI_WRITE(LSR0, lsr0);
-
-        pr_debug("PCI:Writing 0x%08x to LSR0\n",lsr0);
-
-        /* Set MBAR 0 */
-        SH5PCI_WRITE(CSR_MBAR0, memory_start);
-        SH5PCI_WRITE(LAR0, memory_start);
-
-        SH5PCI_WRITE(CSR_MBAR1,0);
-        SH5PCI_WRITE(LAR1,0);
-        SH5PCI_WRITE(LSR1,0);
-
-        pr_debug("PCI:Writing 0x%08llx to CSR_MBAR0\n",memory_start);
-        pr_debug("PCI:Writing 0x%08llx to LAR0\n",memory_start);
-
-        /* Enable the PCI interrupts on the device */
-        SH5PCI_WRITE(INTM,  ~0);
-        SH5PCI_WRITE(AINTM, ~0);
-        SH5PCI_WRITE(PINTM, ~0);
-
-        pr_debug("Switching on all error interrupts\n");
-
-        return(0);
-}
-
-static int sh5pci_read(struct pci_bus *bus, unsigned int devfn, int where,
-                        int size, u32 *val)
-{
-        SH5PCI_WRITE(PAR, CONFIG_CMD(bus, devfn, where));
-
-        switch (size) {
-                case 1:
-                        *val = (u8)SH5PCI_READ_BYTE(PDR + (where & 3));
-                        break;
-                case 2:
-                        *val = (u16)SH5PCI_READ_SHORT(PDR + (where & 2));
-                        break;
-                case 4:
-                        *val = SH5PCI_READ(PDR);
-                        break;
-        }
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-static int sh5pci_write(struct pci_bus *bus, unsigned int devfn, int where,
-                         int size, u32 val)
-{
-        SH5PCI_WRITE(PAR, CONFIG_CMD(bus, devfn, where));
-
-        switch (size) {
-                case 1:
-                        SH5PCI_WRITE_BYTE(PDR + (where & 3), (u8)val);
-                        break;
-                case 2:
-                        SH5PCI_WRITE_SHORT(PDR + (where & 2), (u16)val);
-                        break;
-                case 4:
-                        SH5PCI_WRITE(PDR, val);
-                        break;
-        }
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops pci_config_ops = {
-        .read =         sh5pci_read,
-        .write =        sh5pci_write,
-};
-
-/* Everything hangs off this */
-static struct pci_bus *pci_root_bus;
-
-
-static u8 __init no_swizzle(struct pci_dev *dev, u8 * pin)
-{
-        pr_debug("swizzle for dev %d on bus %d slot %d pin is %d\n",
-                 dev->devfn,dev->bus->number, PCI_SLOT(dev->devfn),*pin);
-        return PCI_SLOT(dev->devfn);
-}
-
-static inline u8 bridge_swizzle(u8 pin, u8 slot)
-{
-        return (((pin-1) + slot) % 4) + 1;
-}
-
-u8 __init common_swizzle(struct pci_dev *dev, u8 *pinp)
-{
-        if (dev->bus->number != 0) {
-                u8 pin = *pinp;
-                do {
-                        pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));
-                        /* Move up the chain of bridges. */
-                        dev = dev->bus->self;
-                } while (dev->bus->self);
-                *pinp = pin;
-
-                /* The slot is the slot of the last bridge. */
-        }
-
-        return PCI_SLOT(dev->devfn);
-}
-
-/* This needs to be shunted out of here into the board specific bit */
-
-static int __init map_cayman_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-        int result = -1;
-
-        /* The complication here is that the PCI IRQ lines from the Cayman's 2
-           5V slots get into the CPU via a different path from the IRQ lines
-           from the 3 3.3V slots.  Thus, we have to detect whether the card's
-           interrupts go via the 5V or 3.3V path, i.e. the 'bridge swizzling'
-           at the point where we cross from 5V to 3.3V is not the normal case.
-
-           The added complication is that we don't know that the 5V slots are
-           always bus 2, because a card containing a PCI-PCI bridge may be
-           plugged into a 3.3V slot, and this changes the bus numbering.
-
-           Also, the Cayman has an intermediate PCI bus that goes a custom
-           expansion board header (and to the secondary bridge).  This bus has
-           never been used in practice.
-
-           The 1ary onboard PCI-PCI bridge is device 3 on bus 0
-           The 2ary onboard PCI-PCI bridge is device 0 on the 2ary bus of the 1ary bridge.
-           */
-
-        struct slot_pin {
-                int slot;
-                int pin;
-        } path[4];
-        int i=0;
-
-        while (dev->bus->number > 0) {
-
-                slot = path[i].slot = PCI_SLOT(dev->devfn);
-                pin = path[i].pin = bridge_swizzle(pin, slot);
-                dev = dev->bus->self;
-                i++;
-                if (i > 3) panic("PCI path to root bus too long!\n");
-        }
-
-        slot = PCI_SLOT(dev->devfn);
-        /* This is the slot on bus 0 through which the device is eventually
-           reachable. */
-
-        /* Now work back up. */
-        if ((slot < 3) || (i == 0)) {
-                /* Bus 0 (incl. PCI-PCI bridge itself) : perform the final
-                   swizzle now. */
-                result = IRQ_INTA + bridge_swizzle(pin, slot) - 1;
-        } else {
-                i--;
-                slot = path[i].slot;
-                pin  = path[i].pin;
-                if (slot > 0) {
-                        panic("PCI expansion bus device found - not handled!\n");
-                } else {
-                        if (i > 0) {
-                                /* 5V slots */
-                                i--;
-                                slot = path[i].slot;
-                                pin  = path[i].pin;
-                                /* 'pin' was swizzled earlier wrt slot, don't do it again. */
-                                result = IRQ_P2INTA + (pin - 1);
-                        } else {
-                                /* IRQ for 2ary PCI-PCI bridge : unused */
-                                result = -1;
-                        }
-                }
-        }
-
-        return result;
-}
-
-static irqreturn_t pcish5_err_irq(int irq, void *dev_id)
-{
-        struct pt_regs *regs = get_irq_regs();
-        unsigned pci_int, pci_air, pci_cir, pci_aint;
-
-        pci_int = SH5PCI_READ(INT);
-        pci_cir = SH5PCI_READ(CIR);
-        pci_air = SH5PCI_READ(AIR);
-
-        if (pci_int) {
-                printk("PCI INTERRUPT (at %08llx)!\n", regs->pc);
-                printk("PCI INT -> 0x%x\n", pci_int & 0xffff);
-                printk("PCI AIR -> 0x%x\n", pci_air);
-                printk("PCI CIR -> 0x%x\n", pci_cir);
-                SH5PCI_WRITE(INT, ~0);
-        }
-
-        pci_aint = SH5PCI_READ(AINT);
-        if (pci_aint) {
-                printk("PCI ARB INTERRUPT!\n");
-                printk("PCI AINT -> 0x%x\n", pci_aint);
-                printk("PCI AIR -> 0x%x\n", pci_air);
-                printk("PCI CIR -> 0x%x\n", pci_cir);
-                SH5PCI_WRITE(AINT, ~0);
-        }
-
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t pcish5_serr_irq(int irq, void *dev_id)
-{
-        printk("SERR IRQ\n");
-
-        return IRQ_NONE;
-}
-
-static void __init
-pcibios_size_bridge(struct pci_bus *bus, struct resource *ior,
-                    struct resource *memr)
-{
-        struct resource io_res, mem_res;
-        struct pci_dev *dev;
-        struct pci_dev *bridge = bus->self;
-        struct list_head *ln;
-
-        if (!bridge)
-                return; /* host bridge, nothing to do */
-
-        /* set reasonable default locations for pcibios_align_resource */
-        io_res.start = PCIBIOS_MIN_IO;
-        mem_res.start = PCIBIOS_MIN_MEM;
-
-        io_res.end = io_res.start;
-        mem_res.end = mem_res.start;
-
-        /* Collect information about how our direct children are layed out. */
-        for (ln=bus->devices.next; ln != &bus->devices; ln=ln->next) {
-                int i;
-                dev = pci_dev_b(ln);
-
-                /* Skip bridges for now */
-                if (dev->class >> 8 == PCI_CLASS_BRIDGE_PCI)
-                        continue;
-
-                for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-                        struct resource res;
-                        unsigned long size;
-
-                        memcpy(&res, &dev->resource[i], sizeof(res));
-                        size = res.end - res.start + 1;
-
-                        if (res.flags & IORESOURCE_IO) {
-                                res.start = io_res.end;
-                                pcibios_align_resource(dev, &res, size, 0);
-                                io_res.end = res.start + size;
-                        } else if (res.flags & IORESOURCE_MEM) {
-                                res.start = mem_res.end;
-                                pcibios_align_resource(dev, &res, size, 0);
-                                mem_res.end = res.start + size;
-                        }
-                }
-        }
-
-        /* And for all of the subordinate busses. */
-        for (ln=bus->children.next; ln != &bus->children; ln=ln->next)
-                pcibios_size_bridge(pci_bus_b(ln), &io_res, &mem_res);
-
-        /* turn the ending locations into sizes (subtract start) */
-        io_res.end -= io_res.start;
-        mem_res.end -= mem_res.start;
-
-        /* Align the sizes up by bridge rules */
-        io_res.end = ALIGN(io_res.end, 4*1024) - 1;
-        mem_res.end = ALIGN(mem_res.end, 1*1024*1024) - 1;
-
-        /* Adjust the bridge's allocation requirements */
-        bridge->resource[0].end = bridge->resource[0].start + io_res.end;
-        bridge->resource[1].end = bridge->resource[1].start + mem_res.end;
-
-        bridge->resource[PCI_BRIDGE_RESOURCES].end =
-            bridge->resource[PCI_BRIDGE_RESOURCES].start + io_res.end;
-        bridge->resource[PCI_BRIDGE_RESOURCES+1].end =
-            bridge->resource[PCI_BRIDGE_RESOURCES+1].start + mem_res.end;
-
-        /* adjust parent's resource requirements */
-        if (ior) {
-                ior->end = ALIGN(ior->end, 4*1024);
-                ior->end += io_res.end;
-        }
-
-        if (memr) {
-                memr->end = ALIGN(memr->end, 1*1024*1024);
-                memr->end += mem_res.end;
-        }
-}
-
-static void __init pcibios_size_bridges(void)
-{
-        struct resource io_res, mem_res;
-
-        memset(&io_res, 0, sizeof(io_res));
-        memset(&mem_res, 0, sizeof(mem_res));
-
-        pcibios_size_bridge(pci_root_bus, &io_res, &mem_res);
-}
-
-static int __init pcibios_init(void)
-{
-        if (request_irq(IRQ_ERR, pcish5_err_irq,
-                        IRQF_DISABLED, "PCI Error",NULL) < 0) {
-                printk(KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n");
-                return -EINVAL;
-        }
-
-        if (request_irq(IRQ_SERR, pcish5_serr_irq,
-                        IRQF_DISABLED, "PCI SERR interrupt", NULL) < 0) {
-                printk(KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n");
-                return -EINVAL;
-        }
-
-        /* The pci subsystem needs to know where memory is and how much
-         * of it there is. I've simply made these globals. A better mechanism
-         * is probably needed.
-         */
-        sh5pci_init(__pa(memory_start),
-                     __pa(memory_end) - __pa(memory_start));
-
-        pci_root_bus = pci_scan_bus(0, &pci_config_ops, NULL);
-        pcibios_size_bridges();
-        pci_assign_unassigned_resources();
-        pci_fixup_irqs(no_swizzle, map_cayman_irq);
-
-        return 0;
-}
-
-subsys_initcall(pcibios_init);
-
-void __devinit pcibios_fixup_bus(struct pci_bus *bus)
-{
-        struct pci_dev *dev = bus->self;
-        int i;
-
-#if 1
-        if(dev) {
-                for(i=0; i<3; i++) {
-                        bus->resource[i] =
-                                &dev->resource[PCI_BRIDGE_RESOURCES+i];
-                        bus->resource[i]->name = bus->name;
-                }
-                bus->resource[0]->flags |= IORESOURCE_IO;
-                bus->resource[1]->flags |= IORESOURCE_MEM;
-
-                /* For now, propagate host limits to the bus;
-                 * we'll adjust them later. */
-
-#if 1
-                bus->resource[0]->end = 64*1024 - 1 ;
-                bus->resource[1]->end = PCIBIOS_MIN_MEM+(256*1024*1024)-1;
-                bus->resource[0]->start = PCIBIOS_MIN_IO;
-                bus->resource[1]->start = PCIBIOS_MIN_MEM;
-#else
-                bus->resource[0]->end = 0;
-                bus->resource[1]->end = 0;
-                bus->resource[0]->start =0;
-                bus->resource[1]->start = 0;
-#endif
-                /* Turn off downstream PF memory address range by default */
-                bus->resource[2]->start = 1024*1024;
-                bus->resource[2]->end = bus->resource[2]->start - 1;
-        }
-#endif
-
-}
-
diff --git a/arch/sh64/kernel/pcibios.c b/arch/sh64/kernel/pcibios.c
deleted file mode 100644
index 945920bc24db..000000000000
--- a/arch/sh64/kernel/pcibios.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * $Id: pcibios.c,v 1.1 2001/08/24 12:38:19 dwmw2 Exp $
- *
- * arch/sh/kernel/pcibios.c
- *
- * Copyright (C) 2002 STMicroelectronics Limited
- *   Author : David J. McKay
- *
- * Copyright (C) 2004 Richard Curnow, SuperH UK Limited
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- * This is GPL'd.
- *
- * Provided here are generic versions of:
- *      pcibios_update_resource()
- *      pcibios_align_resource()
- *      pcibios_enable_device()
- *      pcibios_set_master()
- *      pcibios_update_irq()
- *
- * These functions are collected here to reduce duplication of common
- * code amongst the many platform-specific PCI support code files.
- *
- * Platform-specific files are expected to provide:
- *      pcibios_fixup_bus()
- *      pcibios_init()
- *      pcibios_setup()
- *      pcibios_fixup_pbus_ranges()
- */
-
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-
-void
-pcibios_update_resource(struct pci_dev *dev, struct resource *root,
-                        struct resource *res, int resource)
-{
-        u32 new, check;
-        int reg;
-
-        new = res->start | (res->flags & PCI_REGION_FLAG_MASK);
-        if (resource < 6) {
-                reg = PCI_BASE_ADDRESS_0 + 4*resource;
-        } else if (resource == PCI_ROM_RESOURCE) {
-                res->flags |= IORESOURCE_ROM_ENABLE;
-                new |= PCI_ROM_ADDRESS_ENABLE;
-                reg = dev->rom_base_reg;
-        } else {
-                /* Somebody might have asked allocation of a non-standard resource */
-                return;
-        }
-
-        pci_write_config_dword(dev, reg, new);
-        pci_read_config_dword(dev, reg, &check);
-        if ((new ^ check) & ((new & PCI_BASE_ADDRESS_SPACE_IO) ? PCI_BASE_ADDRESS_IO_MASK : PCI_BASE_ADDRESS_MEM_MASK)) {
-                printk(KERN_ERR "PCI: Error while updating region "
-                       "%s/%d (%08x != %08x)\n", pci_name(dev), resource,
-                       new, check);
-        }
-}
-
-/*
- * We need to avoid collisions with `mirrored' VGA ports
- * and other strange ISA hardware, so we always want the
- * addresses to be allocated in the 0x000-0x0ff region
- * modulo 0x400.
- */
-void pcibios_align_resource(void *data, struct resource *res,
-                            resource_size_t size, resource_size_t align)
-{
-        if (res->flags & IORESOURCE_IO) {
-                resource_size_t start = res->start;
-
-                if (start & 0x300) {
-                        start = (start + 0x3ff) & ~0x3ff;
-                        res->start = start;
-                }
-        }
-}
-
-static void pcibios_enable_bridge(struct pci_dev *dev)
-{
-        struct pci_bus *bus = dev->subordinate;
-        u16 cmd, old_cmd;
-
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        old_cmd = cmd;
-
-        if (bus->resource[0]->flags & IORESOURCE_IO) {
-                cmd |= PCI_COMMAND_IO;
-        }
-        if ((bus->resource[1]->flags & IORESOURCE_MEM) ||
-            (bus->resource[2]->flags & IORESOURCE_PREFETCH)) {
-                cmd |= PCI_COMMAND_MEMORY;
-        }
-
-        if (cmd != old_cmd) {
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-
-        printk("PCI bridge %s, command register -> %04x\n",
-                pci_name(dev), cmd);
-
-}
-
-
-
-int pcibios_enable_device(struct pci_dev *dev, int mask)
-{
-        u16 cmd, old_cmd;
-        int idx;
-        struct resource *r;
-
-        if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
-                pcibios_enable_bridge(dev);
-        }
-
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        old_cmd = cmd;
-        for(idx=0; idx<6; idx++) {
-                if (!(mask & (1 << idx)))
-                        continue;
-                r = &dev->resource[idx];
-                if (!r->start && r->end) {
-                        printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
-                        return -EINVAL;
-                }
-                if (r->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                if (r->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-        if (dev->resource[PCI_ROM_RESOURCE].start)
-                cmd |= PCI_COMMAND_MEMORY;
-        if (cmd != old_cmd) {
-                printk(KERN_INFO "PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd);
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-        return 0;
-}
-
-/*
- *  If we set up a device for bus mastering, we need to check and set
- *  the latency timer as it may not be properly set.
- */
-unsigned int pcibios_max_latency = 255;
-
-void pcibios_set_master(struct pci_dev *dev)
-{
-        u8 lat;
-        pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
-        if (lat < 16)
-                lat = (64 <= pcibios_max_latency) ? 64 : pcibios_max_latency;
-        else if (lat > pcibios_max_latency)
-                lat = pcibios_max_latency;
-        else
-                return;
-        printk(KERN_INFO "PCI: Setting latency timer of device %s to %d\n", pci_name(dev), lat);
-        pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
-}
-
-void __init pcibios_update_irq(struct pci_dev *dev, int irq)
-{
-        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
-}
diff --git a/arch/sh64/kernel/semaphore.c b/arch/sh64/kernel/semaphore.c
deleted file mode 100644
index 72c16533436e..000000000000
--- a/arch/sh64/kernel/semaphore.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Just taken from alpha implementation.
- * This can't work well, perhaps.
- */
-/*
- *  Generic semaphore code. Buyer beware. Do your own
- * specific changes in <asm/semaphore-helper.h>
- */
-
-#include <linux/errno.h>
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/init.h>
-#include <asm/semaphore.h>
-#include <asm/semaphore-helper.h>
-
-spinlock_t semaphore_wake_lock;
-
-/*
- * Semaphores are implemented using a two-way counter:
- * The "count" variable is decremented for each process
- * that tries to sleep, while the "waking" variable is
- * incremented when the "up()" code goes to wake up waiting
- * processes.
- *
- * Notably, the inline "up()" and "down()" functions can
- * efficiently test if they need to do any extra work (up
- * needs to do something only if count was negative before
- * the increment operation.
- *
- * waking_non_zero() (from asm/semaphore.h) must execute
- * atomically.
- *
- * When __up() is called, the count was negative before
- * incrementing it, and we need to wake up somebody.
- *
- * This routine adds one to the count of processes that need to
- * wake up and exit.  ALL waiting processes actually wake up but
- * only the one that gets to the "waking" field first will gate
- * through and acquire the semaphore.  The others will go back
- * to sleep.
- *
- * Note that these functions are only called when there is
- * contention on the lock, and as such all this is the
- * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
- * where we want to avoid any extra jumps and calls.
- */
-void __up(struct semaphore *sem)
-{
-        wake_one_more(sem);
-        wake_up(&sem->wait);
-}
-
-/*
- * Perform the "down" function.  Return zero for semaphore acquired,
- * return negative for signalled out of the function.
- *
- * If called from __down, the return is ignored and the wait loop is
- * not interruptible.  This means that a task waiting on a semaphore
- * using "down()" cannot be killed until someone does an "up()" on
- * the semaphore.
- *
- * If called from __down_interruptible, the return value gets checked
- * upon return.  If the return value is negative then the task continues
- * with the negative value in the return register (it can be tested by
- * the caller).
- *
- * Either form may be used in conjunction with "up()".
- *
- */
-
-#define DOWN_VAR                                \
-        struct task_struct *tsk = current;      \
-        wait_queue_t wait;                      \
-        init_waitqueue_entry(&wait, tsk);
-
-#define DOWN_HEAD(task_state)                                           \
-                                                                        \
-                                                                        \
-        tsk->state = (task_state);                                      \
-        add_wait_queue(&sem->wait, &wait);                              \
-                                                                        \
-        /*                                                              \
-         * Ok, we're set up.  sem->count is known to be less than zero  \
-         * so we must wait.                                             \
-         *                                                              \
-         * We can let go the lock for purposes of waiting.              \
-         * We re-acquire it after awaking so as to protect              \
-         * all semaphore operations.                                    \
-         *                                                              \
-         * If "up()" is called before we call waking_non_zero() then    \
-         * we will catch it right away.  If it is called later then     \
-         * we will have to go through a wakeup cycle to catch it.       \
-         *                                                              \
-         * Multiple waiters contend for the semaphore lock to see       \
-         * who gets to gate through and who has to wait some more.      \
-         */                                                             \
-        for (;;) {
-
-#define DOWN_TAIL(task_state)                   \
-                tsk->state = (task_state);      \
-        }                                       \
-        tsk->state = TASK_RUNNING;              \
-        remove_wait_queue(&sem->wait, &wait);
-
-void __sched __down(struct semaphore * sem)
-{
-        DOWN_VAR
-        DOWN_HEAD(TASK_UNINTERRUPTIBLE)
-        if (waking_non_zero(sem))
-                break;
-        schedule();
-        DOWN_TAIL(TASK_UNINTERRUPTIBLE)
-}
-
-int __sched __down_interruptible(struct semaphore * sem)
-{
-        int ret = 0;
-        DOWN_VAR
-        DOWN_HEAD(TASK_INTERRUPTIBLE)
-
-        ret = waking_non_zero_interruptible(sem, tsk);
-        if (ret)
-        {
-                if (ret == 1)
-                        /* ret != 0 only if we get interrupted -arca */
-                        ret = 0;
-                break;
-        }
-        schedule();
-        DOWN_TAIL(TASK_INTERRUPTIBLE)
-        return ret;
-}
-
-int __down_trylock(struct semaphore * sem)
-{
-        return waking_non_zero_trylock(sem);
-}
diff --git a/arch/sh64/kernel/setup.c b/arch/sh64/kernel/setup.c
deleted file mode 100644
index 2b7264c0c6f7..000000000000
--- a/arch/sh64/kernel/setup.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/setup.c
- *
- * sh64 Arch Support
- *
- * This file handles the architecture-dependent parts of initialization
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- *
- * benedict.gaster@superh.com:   2nd May 2002
- *    Modified to use the empty_zero_page to pass command line arguments.
- *
- * benedict.gaster@superh.com:   3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time.
- *
- * lethal@linux-sh.org:          15th May 2003
- *    Added generic procfs cpuinfo reporting. Make boards just export their name.
- *
- * lethal@linux-sh.org:          25th May 2003
- *    Added generic get_cpu_subtype() for subtype reporting from cpu_data->type.
- *
- */
-#include <linux/errno.h>
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/stddef.h>
-#include <linux/unistd.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/screen_info.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/seq_file.h>
-#include <linux/blkdev.h>
-#include <linux/bootmem.h>
-#include <linux/console.h>
-#include <linux/root_dev.h>
-#include <linux/cpu.h>
-#include <linux/initrd.h>
-#include <linux/pfn.h>
-#include <asm/processor.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/platform.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/sections.h>
-#include <asm/setup.h>
-#include <asm/smp.h>
-
-struct screen_info screen_info;
-
-#ifdef CONFIG_BLK_DEV_RAM
-extern int rd_doload;           /* 1 = load ramdisk, 0 = don't load */
-extern int rd_prompt;           /* 1 = prompt for ramdisk, 0 = don't prompt */
-extern int rd_image_start;      /* starting block # of image */
-#endif
-
-extern int root_mountflags;
-extern char *get_system_type(void);
-extern void platform_setup(void);
-extern void platform_monitor(void);
-extern void platform_reserve(void);
-extern int sh64_cache_init(void);
-extern int sh64_tlb_init(void);
-
-#define RAMDISK_IMAGE_START_MASK        0x07FF
-#define RAMDISK_PROMPT_FLAG             0x8000
-#define RAMDISK_LOAD_FLAG               0x4000
-
-static char __initdata command_line[COMMAND_LINE_SIZE] = { 0, };
-unsigned long long memory_start = CONFIG_MEMORY_START;
-unsigned long long memory_end = CONFIG_MEMORY_START + (CONFIG_MEMORY_SIZE_IN_MB * 1024 * 1024);
-
-struct sh_cpuinfo boot_cpu_data;
-
-static inline void parse_mem_cmdline (char ** cmdline_p)
-{
-        char c = ' ', *to = command_line, *from = COMMAND_LINE;
-        int len = 0;
-
-        /* Save unparsed command line copy for /proc/cmdline */
-        memcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
-        boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
-
-        for (;;) {
-          /*
-           * "mem=XXX[kKmM]" defines a size of memory.
-           */
-                if (c == ' ' && !memcmp(from, "mem=", 4)) {
-                      if (to != command_line)
-                        to--;
-                      {
-                        unsigned long mem_size;
-
-                        mem_size = memparse(from+4, &from);
-                        memory_end = memory_start + mem_size;
-                      }
-                }
-                c = *(from++);
-                if (!c)
-                  break;
-                if (COMMAND_LINE_SIZE <= ++len)
-                  break;
-                *(to++) = c;
-        }
-        *to = '\0';
-
-        *cmdline_p = command_line;
-}
-
-static void __init sh64_cpu_type_detect(void)
-{
-        extern unsigned long long peek_real_address_q(unsigned long long addr);
-        unsigned long long cir;
-        /* Do peeks in real mode to avoid having to set up a mapping for the
-           WPC registers.  On SH5-101 cut2, such a mapping would be exposed to
-           an address translation erratum which would make it hard to set up
-           correctly. */
-        cir = peek_real_address_q(0x0d000008);
-
-        if ((cir & 0xffff) == 0x5103) {
-                boot_cpu_data.type = CPU_SH5_103;
-        } else if (((cir >> 32) & 0xffff) == 0x51e2) {
-                /* CPU.VCR aliased at CIR address on SH5-101 */
-                boot_cpu_data.type = CPU_SH5_101;
-        } else {
-                boot_cpu_data.type = CPU_SH_NONE;
-        }
-}
-
-void __init setup_arch(char **cmdline_p)
-{
-        unsigned long bootmap_size, i;
-        unsigned long first_pfn, start_pfn, last_pfn, pages;
-
-#ifdef CONFIG_EARLY_PRINTK
-        extern void enable_early_printk(void);
-
-        /*
-         * Setup Early SCIF console
-         */
-        enable_early_printk();
-#endif
-
-        /*
-         * Setup TLB mappings
-         */
-        sh64_tlb_init();
-
-        /*
-         * Caches are already initialized by the time we get here, so we just
-         * fill in cpu_data info for the caches.
-         */
-        sh64_cache_init();
-
-        platform_setup();
-        platform_monitor();
-
-        sh64_cpu_type_detect();
-
-        ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
-
-#ifdef CONFIG_BLK_DEV_RAM
-        rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;
-        rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0);
-        rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0);
-#endif
-
-        if (!MOUNT_ROOT_RDONLY)
-                root_mountflags &= ~MS_RDONLY;
-        init_mm.start_code = (unsigned long) _text;
-        init_mm.end_code = (unsigned long) _etext;
-        init_mm.end_data = (unsigned long) _edata;
-        init_mm.brk = (unsigned long) _end;
-
-        code_resource.start = __pa(_text);
-        code_resource.end = __pa(_etext)-1;
-        data_resource.start = __pa(_etext);
-        data_resource.end = __pa(_edata)-1;
-
-        parse_mem_cmdline(cmdline_p);
-
-        /*
-         * Find the lowest and highest page frame numbers we have available
-         */
-        first_pfn = PFN_DOWN(memory_start);
-        last_pfn = PFN_DOWN(memory_end);
-        pages = last_pfn - first_pfn;
-
-        /*
-         * Partially used pages are not usable - thus
-         * we are rounding upwards:
-         */
-        start_pfn = PFN_UP(__pa(_end));
-
-        /*
-         * Find a proper area for the bootmem bitmap. After this
-         * bootstrap step all allocations (until the page allocator
-         * is intact) must be done via bootmem_alloc().
-         */
-        bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn,
-                                         first_pfn,
-                                         last_pfn);
-        /*
-         * Round it up.
-         */
-        bootmap_size = PFN_PHYS(PFN_UP(bootmap_size));
-
-        /*
-         * Register fully available RAM pages with the bootmem allocator.
-         */
-        free_bootmem_node(NODE_DATA(0), PFN_PHYS(first_pfn), PFN_PHYS(pages));
-
-        /*
-         * Reserve all kernel sections + bootmem bitmap + a guard page.
-         */
-        reserve_bootmem_node(NODE_DATA(0), PFN_PHYS(first_pfn),
-                        (PFN_PHYS(start_pfn) + bootmap_size + PAGE_SIZE) - PFN_PHYS(first_pfn));
-
-        /*
-         * Reserve platform dependent sections
-         */
-        platform_reserve();
-
-#ifdef CONFIG_BLK_DEV_INITRD
-        if (LOADER_TYPE && INITRD_START) {
-                if (INITRD_START + INITRD_SIZE <= (PFN_PHYS(last_pfn))) {
-                        reserve_bootmem_node(NODE_DATA(0), INITRD_START + __MEMORY_START, INITRD_SIZE);
-
-                        initrd_start = (long) INITRD_START + PAGE_OFFSET + __MEMORY_START;
-                        initrd_end = initrd_start + INITRD_SIZE;
-                } else {
-                        printk("initrd extends beyond end of memory "
-                            "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
-                                    (long) INITRD_START + INITRD_SIZE,
-                                    PFN_PHYS(last_pfn));
-                        initrd_start = 0;
-                }
-        }
-#endif
-
-        /*
-         * Claim all RAM, ROM, and I/O resources.
-         */
-
-        /* Kernel RAM */
-        request_resource(&iomem_resource, &code_resource);
-        request_resource(&iomem_resource, &data_resource);
-
-        /* Other KRAM space */
-        for (i = 0; i < STANDARD_KRAM_RESOURCES - 2; i++)
-                request_resource(&iomem_resource,
-                                 &platform_parms.kram_res_p[i]);
-
-        /* XRAM space */
-        for (i = 0; i < STANDARD_XRAM_RESOURCES; i++)
-                request_resource(&iomem_resource,
-                                 &platform_parms.xram_res_p[i]);
-
-        /* ROM space */
-        for (i = 0; i < STANDARD_ROM_RESOURCES; i++)
-                request_resource(&iomem_resource,
-                                 &platform_parms.rom_res_p[i]);
-
-        /* I/O space */
-        for (i = 0; i < STANDARD_IO_RESOURCES; i++)
-                request_resource(&ioport_resource,
-                                 &platform_parms.io_res_p[i]);
-
-
-#ifdef CONFIG_VT
-#if defined(CONFIG_VGA_CONSOLE)
-        conswitchp = &vga_con;
-#elif defined(CONFIG_DUMMY_CONSOLE)
-        conswitchp = &dummy_con;
-#endif
-#endif
-
-        printk("Hardware FPU: %s\n", fpu_in_use ? "enabled" : "disabled");
-
-        paging_init();
-}
-
-void __xchg_called_with_bad_pointer(void)
-{
-        printk(KERN_EMERG "xchg() called with bad pointer !\n");
-}
-
-static struct cpu cpu[1];
-
-static int __init topology_init(void)
-{
-        return register_cpu(cpu, 0);
-}
-
-subsys_initcall(topology_init);
-
-/*
- *      Get CPU information
- */
-static const char *cpu_name[] = {
-        [CPU_SH5_101]   = "SH5-101",
-        [CPU_SH5_103]   = "SH5-103",
-        [CPU_SH_NONE]   = "Unknown",
-};
-
-const char *get_cpu_subtype(void)
-{
-        return cpu_name[boot_cpu_data.type];
-}
-
-#ifdef CONFIG_PROC_FS
-static int show_cpuinfo(struct seq_file *m,void *v)
-{
-        unsigned int cpu = smp_processor_id();
-
-        if (!cpu)
-                seq_printf(m, "machine\t\t: %s\n", get_system_type());
-
-        seq_printf(m, "processor\t: %d\n", cpu);
-        seq_printf(m, "cpu family\t: SH-5\n");
-        seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype());
-
-        seq_printf(m, "icache size\t: %dK-bytes\n",
-                   (boot_cpu_data.icache.ways *
-                    boot_cpu_data.icache.sets *
-                    boot_cpu_data.icache.linesz) >> 10);
-        seq_printf(m, "dcache size\t: %dK-bytes\n",
-                   (boot_cpu_data.dcache.ways *
-                    boot_cpu_data.dcache.sets *
-                    boot_cpu_data.dcache.linesz) >> 10);
-        seq_printf(m, "itlb entries\t: %d\n", boot_cpu_data.itlb.entries);
-        seq_printf(m, "dtlb entries\t: %d\n", boot_cpu_data.dtlb.entries);
-
-#define PRINT_CLOCK(name, value) \
-        seq_printf(m, name " clock\t: %d.%02dMHz\n", \
-                     ((value) / 1000000), ((value) % 1000000)/10000)
-
-        PRINT_CLOCK("cpu", boot_cpu_data.cpu_clock);
-        PRINT_CLOCK("bus", boot_cpu_data.bus_clock);
-        PRINT_CLOCK("module", boot_cpu_data.module_clock);
-
-        seq_printf(m, "bogomips\t: %lu.%02lu\n\n",
-                     (loops_per_jiffy*HZ+2500)/500000,
-                     ((loops_per_jiffy*HZ+2500)/5000) % 100);
-
-        return 0;
-}
-
-static void *c_start(struct seq_file *m, loff_t *pos)
-{
-        return (void*)(*pos == 0);
-}
-static void *c_next(struct seq_file *m, void *v, loff_t *pos)
-{
-        return NULL;
-}
-static void c_stop(struct seq_file *m, void *v)
-{
-}
-struct seq_operations cpuinfo_op = {
-        .start  = c_start,
-        .next   = c_next,
-        .stop   = c_stop,
-        .show   = show_cpuinfo,
-};
-#endif /* CONFIG_PROC_FS */
diff --git a/arch/sh64/kernel/sys_sh64.c b/arch/sh64/kernel/sys_sh64.c
deleted file mode 100644
index de0a303ba26f..000000000000
--- a/arch/sh64/kernel/sys_sh64.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/kernel/sys_sh64.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * This file contains various random system calls that
- * have a non-standard calling sequence on the Linux/SH5
- * platform.
- *
- * Mostly taken from i386 version.
- *
- */
-
-#include <linux/errno.h>
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/fs.h>
-#include <linux/smp.h>
-#include <linux/sem.h>
-#include <linux/msg.h>
-#include <linux/shm.h>
-#include <linux/stat.h>
-#include <linux/mman.h>
-#include <linux/file.h>
-#include <linux/utsname.h>
-#include <linux/syscalls.h>
-#include <linux/ipc.h>
-#include <asm/uaccess.h>
-#include <asm/ptrace.h>
-#include <asm/unistd.h>
-
-#define REG_3   3
-
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way Unix traditionally does this, though.
- */
-#ifdef NEW_PIPE_IMPLEMENTATION
-asmlinkage int sys_pipe(unsigned long * fildes,
-                        unsigned long   dummy_r3,
-                        unsigned long   dummy_r4,
-                        unsigned long   dummy_r5,
-                        unsigned long   dummy_r6,
-                        unsigned long   dummy_r7,
-                        struct pt_regs * regs)     /* r8 = pt_regs  forced by entry.S */
-{
-        int fd[2];
-        int ret;
-
-        ret = do_pipe(fd);
-        if (ret == 0)
-                /*
-                 ***********************************************************************
-                 *   To avoid the copy_to_user we prefer to break the ABIs convention, *
-                 *   packing the valid pair of file IDs into a single register (r3);   *
-                 *   while r2 is the return code as defined by the sh5-ABIs.           *
-                 *   BE CAREFUL: pipe stub, into glibc, must be aware of this solution *
-                 ***********************************************************************
-
-#ifdef __LITTLE_ENDIAN__
-                regs->regs[REG_3] = (((unsigned long long) fd[1]) << 32) | ((unsigned long long) fd[0]);
-#else
-                regs->regs[REG_3] = (((unsigned long long) fd[0]) << 32) | ((unsigned long long) fd[1]);
-#endif
-
-                */
-               /* although not very clever this is endianess independent */
-                regs->regs[REG_3] = (unsigned long long) *((unsigned long long *) fd);
-
-        return ret;
-}
-
-#else
-asmlinkage int sys_pipe(unsigned long * fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
-#endif
-
-/*
- * To avoid cache alias, we map the shard page with same color.
- */
-#define COLOUR_ALIGN(addr)      (((addr)+SHMLBA-1)&~(SHMLBA-1))
-
-unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
-        unsigned long len, unsigned long pgoff, unsigned long flags)
-{
-        struct vm_area_struct *vma;
-
-        if (flags & MAP_FIXED) {
-                /* We do not accept a shared mapping if it would violate
-                 * cache aliasing constraints.
-                 */
-                if ((flags & MAP_SHARED) && (addr & (SHMLBA - 1)))
-                        return -EINVAL;
-                return addr;
-        }
-
-        if (len > TASK_SIZE)
-                return -ENOMEM;
-        if (!addr)
-                addr = TASK_UNMAPPED_BASE;
-
-        if (flags & MAP_PRIVATE)
-                addr = PAGE_ALIGN(addr);
-        else
-                addr = COLOUR_ALIGN(addr);
-
-        for (vma = find_vma(current->mm, addr); ; vma = vma->vm_next) {
-                /* At this point:  (!vma || addr < vma->vm_end). */
-                if (TASK_SIZE - len < addr)
-                        return -ENOMEM;
-                if (!vma || addr + len <= vma->vm_start)
-                        return addr;
-                addr = vma->vm_end;
-                if (!(flags & MAP_PRIVATE))
-                        addr = COLOUR_ALIGN(addr);
-        }
-}
-
-/* common code for old and new mmaps */
-static inline long do_mmap2(
-        unsigned long addr, unsigned long len,
-        unsigned long prot, unsigned long flags,
-        unsigned long fd, unsigned long pgoff)
-{
-        int error = -EBADF;
-        struct file * file = NULL;
-
-        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-        if (!(flags & MAP_ANONYMOUS)) {
-                file = fget(fd);
-                if (!file)
-                        goto out;
-        }
-
-        down_write(&current->mm->mmap_sem);
-        error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-        up_write(&current->mm->mmap_sem);
-
-        if (file)
-                fput(file);
-out:
-        return error;
-}
-
-asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
-        unsigned long prot, unsigned long flags,
-        unsigned long fd, unsigned long pgoff)
-{
-        return do_mmap2(addr, len, prot, flags, fd, pgoff);
-}
-
-asmlinkage int old_mmap(unsigned long addr, unsigned long len,
-        unsigned long prot, unsigned long flags,
-        int fd, unsigned long off)
-{
-        if (off & ~PAGE_MASK)
-                return -EINVAL;
-        return do_mmap2(addr, len, prot, flags, fd, off>>PAGE_SHIFT);
-}
-
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
- */
-asmlinkage int sys_ipc(uint call, int first, int second,
-                       int third, void __user *ptr, long fifth)
-{
-        int version, ret;
-
-        version = call >> 16; /* hack for backward compatibility */
-        call &= 0xffff;
-
-        if (call <= SEMCTL)
-                switch (call) {
-                case SEMOP:
-                        return sys_semtimedop(first, (struct sembuf __user *)ptr,
-                                              second, NULL);
-                case SEMTIMEDOP:
-                        return sys_semtimedop(first, (struct sembuf __user *)ptr,
-                                              second,
-                                              (const struct timespec __user *)fifth);
-                case SEMGET:
-                        return sys_semget (first, second, third);
-                case SEMCTL: {
-                        union semun fourth;
-                        if (!ptr)
-                                return -EINVAL;
-                        if (get_user(fourth.__pad, (void * __user *) ptr))
-                                return -EFAULT;
-                        return sys_semctl (first, second, third, fourth);
-                        }
-                default:
-                        return -EINVAL;
-                }
-
-        if (call <= MSGCTL)
-                switch (call) {
-                case MSGSND:
-                        return sys_msgsnd (first, (struct msgbuf __user *) ptr,
-                                          second, third);
-                case MSGRCV:
-                        switch (version) {
-                        case 0: {
-                                struct ipc_kludge tmp;
-                                if (!ptr)
-                                        return -EINVAL;
-
-                                if (copy_from_user(&tmp,
-                                                   (struct ipc_kludge __user *) ptr,
-                                                   sizeof (tmp)))
-                                        return -EFAULT;
-                                return sys_msgrcv (first, tmp.msgp, second,
-                                                   tmp.msgtyp, third);
-                                }
-                        default:
-                                return sys_msgrcv (first,
-                                                   (struct msgbuf __user *) ptr,
-                                                   second, fifth, third);
-                        }
-                case MSGGET:
-                        return sys_msgget ((key_t) first, second);
-                case MSGCTL:
-                        return sys_msgctl (first, second,
-                                           (struct msqid_ds __user *) ptr);
-                default:
-                        return -EINVAL;
-                }
-        if (call <= SHMCTL)
-                switch (call) {
-                case SHMAT:
-                        switch (version) {
-                        default: {
-                                ulong raddr;
-                                ret = do_shmat (first, (char __user *) ptr,
-                                                 second, &raddr);
-                                if (ret)
-                                        return ret;
-                                return put_user (raddr, (ulong __user *) third);
-                        }
-                        case 1: /* iBCS2 emulator entry point */
-                                if (!segment_eq(get_fs(), get_ds()))
-                                        return -EINVAL;
-                                return do_shmat (first, (char __user *) ptr,
-                                                  second, (ulong *) third);
-                        }
-                case SHMDT:
-                        return sys_shmdt ((char __user *)ptr);
-                case SHMGET:
-                        return sys_shmget (first, second, third);
-                case SHMCTL:
-                        return sys_shmctl (first, second,
-                                           (struct shmid_ds __user *) ptr);
-                default:
-                        return -EINVAL;
-                }
-
-        return -EINVAL;
-}
-
-asmlinkage int sys_uname(struct old_utsname * name)
-{
-        int err;
-        if (!name)
-                return -EFAULT;
-        down_read(&uts_sem);
-        err = copy_to_user(name, utsname(), sizeof (*name));
-        up_read(&uts_sem);
-        return err?-EFAULT:0;
-}
-
-/*
- * Do a system call from kernel instead of calling sys_execve so we
- * end up with proper pt_regs.
- */
-int kernel_execve(const char *filename, char *const argv[], char *const envp[])
-{
-        register unsigned long __sc0 __asm__ ("r9") = ((0x13 << 16) | __NR_execve);
-        register unsigned long __sc2 __asm__ ("r2") = (unsigned long) filename;
-        register unsigned long __sc3 __asm__ ("r3") = (unsigned long) argv;
-        register unsigned long __sc4 __asm__ ("r4") = (unsigned long) envp;
-        __asm__ __volatile__ ("trapa    %1 !\t\t\t execve(%2,%3,%4)"
-        : "=r" (__sc0)
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4) );
-        __asm__ __volatile__ ("!dummy   %0 %1 %2 %3"
-        : : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4) : "memory");
-        return __sc0;
-}
diff --git a/arch/sh64/kernel/vmlinux.lds.S b/arch/sh64/kernel/vmlinux.lds.S
deleted file mode 100644
index f533a064da5f..000000000000
--- a/arch/sh64/kernel/vmlinux.lds.S
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh5/vmlinux.lds.S
- *
- * ld script to make ST50 Linux kernel
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * benedict.gaster@superh.com:   2nd May 2002
- *    Add definition of empty_zero_page to be the first page of kernel image.
- *
- * benedict.gaster@superh.com:   3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time.
- *
- * lethal@linux-sh.org:          9th May 2003
- *    Kill off GLOBAL_NAME() usage and other CDC-isms.
- *
- * lethal@linux-sh.org:         19th May 2003
- *    Remove support for ancient toolchains.
- */
-
-#include <asm/page.h>
-#include <asm/cache.h>
-#include <asm/processor.h>
-#include <asm/thread_info.h>
-
-#define LOAD_OFFSET     CONFIG_CACHED_MEMORY_OFFSET
-#include <asm-generic/vmlinux.lds.h>
-
-OUTPUT_ARCH(sh:sh5)
-
-#define C_PHYS(x) AT (ADDR(x) - LOAD_OFFSET)
-
-ENTRY(__start)
-SECTIONS
-{
-  . = CONFIG_CACHED_MEMORY_OFFSET + CONFIG_MEMORY_START + PAGE_SIZE;
-  _text = .;                    /* Text and read-only data */
-  text = .;                     /* Text and read-only data */
-
-  .empty_zero_page : C_PHYS(.empty_zero_page) {
-        *(.empty_zero_page)
-        } = 0
-
-  .text : C_PHYS(.text) {
-        *(.text.head)
-        TEXT_TEXT
-        *(.text64)
-        *(.text..SHmedia32)
-        SCHED_TEXT
-        LOCK_TEXT
-        *(.fixup)
-        *(.gnu.warning)
-#ifdef CONFIG_LITTLE_ENDIAN
-        } = 0x6ff0fff0
-#else
-        } = 0xf0fff06f
-#endif
-
-  /* We likely want __ex_table to be Cache Line aligned */
-  . = ALIGN(L1_CACHE_BYTES);            /* Exception table */
-  __start___ex_table = .;
-  __ex_table : C_PHYS(__ex_table) { *(__ex_table) }
-  __stop___ex_table = .;
-
-  _etext = .;                   /* End of text section */
-
-  NOTES 
-
-  RODATA
-
-  .data : C_PHYS(.data) {                       /* Data */
-        DATA_DATA
-        CONSTRUCTORS
-        }
-
-  . = ALIGN(PAGE_SIZE);
-  .data.page_aligned : C_PHYS(.data.page_aligned) { *(.data.page_aligned) }
-
-  PERCPU(PAGE_SIZE)
-
-  . = ALIGN(L1_CACHE_BYTES);
-  .data.cacheline_aligned : C_PHYS(.data.cacheline_aligned) { *(.data.cacheline_aligned) }
-
-  _edata = .;                   /* End of data section */
-
-  . = ALIGN(THREAD_SIZE);       /* init_task: structure size aligned */
-  .data.init_task : C_PHYS(.data.init_task) { *(.data.init_task) }
-
-  . = ALIGN(PAGE_SIZE);         /* Init code and data */
-  __init_begin = .;
-  _sinittext = .;
-  .init.text : C_PHYS(.init.text) { *(.init.text) }
-  _einittext = .;
-  .init.data : C_PHYS(.init.data) { *(.init.data) }
-  . = ALIGN(L1_CACHE_BYTES);    /* Better if Cache Line aligned */
-  __setup_start = .;
-  .init.setup : C_PHYS(.init.setup) { *(.init.setup) }
-  __setup_end = .;
-  __initcall_start = .;
-  .initcall.init : C_PHYS(.initcall.init) {
-        INITCALLS
-  }
-  __initcall_end = .;
-  __con_initcall_start = .;
-  .con_initcall.init : C_PHYS(.con_initcall.init) { *(.con_initcall.init) }
-  __con_initcall_end = .;
-  SECURITY_INIT
-
-#ifdef CONFIG_BLK_DEV_INITRD
-  __initramfs_start = .;
-  .init.ramfs : C_PHYS(.init.ramfs) { *(.init.ramfs) }
-  __initramfs_end = .;
-#endif
-
-  . = ALIGN(PAGE_SIZE);
-  __init_end = .;
-
-  /* Align to the biggest single data representation, head and tail */
-  . = ALIGN(8);
-  __bss_start = .;              /* BSS */
-  .bss : C_PHYS(.bss) {
-        *(.bss)
-        }
-  . = ALIGN(8);
-  _end = . ;
-
-  /* Sections to be discarded */
-  /DISCARD/ : {
-        *(.exit.text)
-        *(.exit.data)
-        *(.exitcall.exit)
-        }
-
-  STABS_DEBUG
-  DWARF_DEBUG
-}
diff --git a/arch/sh64/lib/Makefile b/arch/sh64/lib/Makefile
deleted file mode 100644
index 6a4cc3f9c0b1..000000000000
--- a/arch/sh64/lib/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 2000, 2001  Paolo Alberelli
-# Coprygith (C) 2003  Paul Mundt
-#
-# Makefile for the SH-5 specific library files..
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-# Panic should really be compiled as PIC
-lib-y  := udelay.o c-checksum.o dbg.o io.o panic.o memcpy.o copy_user_memcpy.o \
-                page_copy.o page_clear.o iomap.o
-
diff --git a/arch/sh64/lib/io.c b/arch/sh64/lib/io.c
deleted file mode 100644
index a3f3a2b8e25b..000000000000
--- a/arch/sh64/lib/io.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2000 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * This file contains the I/O routines for use on the overdrive board
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <asm/system.h>
-#include <asm/processor.h>
-#include <asm/io.h>
-
-/*  Now for the string version of these functions */
-void outsb(unsigned long port, const void *addr, unsigned long count)
-{
-        int i;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p++) {
-                outb(*p, port);
-        }
-}
-EXPORT_SYMBOL(outsb);
-
-void insb(unsigned long port, void *addr, unsigned long count)
-{
-        int i;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p++) {
-                *p = inb(port);
-        }
-}
-EXPORT_SYMBOL(insb);
-
-/* For the 16 and 32 bit string functions, we have to worry about alignment.
- * The SH does not do unaligned accesses, so we have to read as bytes and
- * then write as a word or dword.
- * This can be optimised a lot more, especially in the case where the data
- * is aligned
- */
-
-void outsw(unsigned long port, const void *addr, unsigned long count)
-{
-        int i;
-        unsigned short tmp;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p += 2) {
-                tmp = (*p) | ((*(p + 1)) << 8);
-                outw(tmp, port);
-        }
-}
-EXPORT_SYMBOL(outsw);
-
-void insw(unsigned long port, void *addr, unsigned long count)
-{
-        int i;
-        unsigned short tmp;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p += 2) {
-                tmp = inw(port);
-                p[0] = tmp & 0xff;
-                p[1] = (tmp >> 8) & 0xff;
-        }
-}
-EXPORT_SYMBOL(insw);
-
-void outsl(unsigned long port, const void *addr, unsigned long count)
-{
-        int i;
-        unsigned tmp;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p += 4) {
-                tmp = (*p) | ((*(p + 1)) << 8) | ((*(p + 2)) << 16) |
-                    ((*(p + 3)) << 24);
-                outl(tmp, port);
-        }
-}
-EXPORT_SYMBOL(outsl);
-
-void insl(unsigned long port, void *addr, unsigned long count)
-{
-        int i;
-        unsigned tmp;
-        unsigned char *p = (unsigned char *) addr;
-
-        for (i = 0; i < count; i++, p += 4) {
-                tmp = inl(port);
-                p[0] = tmp & 0xff;
-                p[1] = (tmp >> 8) & 0xff;
-                p[2] = (tmp >> 16) & 0xff;
-                p[3] = (tmp >> 24) & 0xff;
-
-        }
-}
-EXPORT_SYMBOL(insl);
-
-void memcpy_toio(void __iomem *to, const void *from, long count)
-{
-        unsigned char *p = (unsigned char *) from;
-
-        while (count) {
-                count--;
-                writeb(*p++, to++);
-        }
-}
-EXPORT_SYMBOL(memcpy_toio);
-
-void memcpy_fromio(void *to, void __iomem *from, long count)
-{
-        int i;
-        unsigned char *p = (unsigned char *) to;
-
-        for (i = 0; i < count; i++) {
-                p[i] = readb(from);
-                from++;
-        }
-}
-EXPORT_SYMBOL(memcpy_fromio);
diff --git a/arch/sh64/lib/iomap.c b/arch/sh64/lib/iomap.c
deleted file mode 100644
index 253d1e351d49..000000000000
--- a/arch/sh64/lib/iomap.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * arch/sh64/lib/iomap.c
- *
- * Generic sh64 iomap interface
- *
- * Copyright (C) 2004  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/pci.h>
-#include <asm/io.h>
-
-void __iomem *__attribute__ ((weak))
-ioport_map(unsigned long port, unsigned int len)
-{
-        return (void __iomem *)port;
-}
-EXPORT_SYMBOL(ioport_map);
-
-void ioport_unmap(void __iomem *addr)
-{
-        /* Nothing .. */
-}
-EXPORT_SYMBOL(ioport_unmap);
-
-#ifdef CONFIG_PCI
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
-{
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
-        unsigned long flags = pci_resource_flags(dev, bar);
-
-        if (!len)
-                return NULL;
-        if (max && len > max)
-                len = max;
-        if (flags & IORESOURCE_IO)
-                return ioport_map(start + pciio_virt, len);
-        if (flags & IORESOURCE_MEM)
-                return (void __iomem *)start;
-
-        /* What? */
-        return NULL;
-}
-EXPORT_SYMBOL(pci_iomap);
-
-void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
-{
-        /* Nothing .. */
-}
-EXPORT_SYMBOL(pci_iounmap);
-#endif
diff --git a/arch/sh64/mach-cayman/Makefile b/arch/sh64/mach-cayman/Makefile
deleted file mode 100644
index 67a2258bf8c4..000000000000
--- a/arch/sh64/mach-cayman/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for the Hitachi Cayman specific parts of the kernel
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-obj-y := setup.o irq.o iomap.o
-obj-$(CONFIG_HEARTBEAT) += led.o
-
diff --git a/arch/sh64/mach-cayman/iomap.c b/arch/sh64/mach-cayman/iomap.c
deleted file mode 100644
index a5c645f02d57..000000000000
--- a/arch/sh64/mach-cayman/iomap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * arch/sh64/mach-cayman/iomap.c
- *
- * Cayman iomap interface
- *
- * Copyright (C) 2004  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <asm/io.h>
-#include <asm/cayman.h>
-
-void __iomem *ioport_map(unsigned long port, unsigned int len)
-{
-        if (port < 0x400)
-                return (void __iomem *)((port << 2) | smsc_superio_virt);
-
-        return (void __iomem *)port;
-}
-
diff --git a/arch/sh64/mach-harp/Makefile b/arch/sh64/mach-harp/Makefile
deleted file mode 100644
index 2f2963fa2131..000000000000
--- a/arch/sh64/mach-harp/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y := setup.o
diff --git a/arch/sh64/mach-harp/setup.c b/arch/sh64/mach-harp/setup.c
deleted file mode 100644
index 05011cb369bb..000000000000
--- a/arch/sh64/mach-harp/setup.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/mach-harp/setup.c
- *
- * SH-5 Simulator Platform Support
- *
- * This file handles the architecture-dependent parts of initialization
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * benedict.gaster@superh.com:   3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time. *
- *
- * lethal@linux-sh.org:          15th May 2003
- *    Use the generic procfs cpuinfo interface, just return a valid board name.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <asm/platform.h>
-#include <asm/irq.h>
-
-/*
- * Platform Dependent Interrupt Priorities.
- */
-
-/* Using defaults defined in irq.h */
-#define RES NO_PRIORITY         /* Disabled */
-#define IR0 IRL0_PRIORITY       /* IRLs */
-#define IR1 IRL1_PRIORITY
-#define IR2 IRL2_PRIORITY
-#define IR3 IRL3_PRIORITY
-#define PCA INTA_PRIORITY       /* PCI Ints */
-#define PCB INTB_PRIORITY
-#define PCC INTC_PRIORITY
-#define PCD INTD_PRIORITY
-#define SER TOP_PRIORITY
-#define ERR TOP_PRIORITY
-#define PW0 TOP_PRIORITY
-#define PW1 TOP_PRIORITY
-#define PW2 TOP_PRIORITY
-#define PW3 TOP_PRIORITY
-#define DM0 NO_PRIORITY         /* DMA Ints */
-#define DM1 NO_PRIORITY
-#define DM2 NO_PRIORITY
-#define DM3 NO_PRIORITY
-#define DAE NO_PRIORITY
-#define TU0 TIMER_PRIORITY      /* TMU Ints */
-#define TU1 NO_PRIORITY
-#define TU2 NO_PRIORITY
-#define TI2 NO_PRIORITY
-#define ATI NO_PRIORITY         /* RTC Ints */
-#define PRI NO_PRIORITY
-#define CUI RTC_PRIORITY
-#define ERI SCIF_PRIORITY       /* SCIF Ints */
-#define RXI SCIF_PRIORITY
-#define BRI SCIF_PRIORITY
-#define TXI SCIF_PRIORITY
-#define ITI TOP_PRIORITY        /* WDT Ints */
-
-/*
- * Platform dependent structures: maps and parms block.
- */
-struct resource io_resources[] = {
-        /* To be updated with external devices */
-};
-
-struct resource kram_resources[] = {
-        /* These must be last in the array */
-        { .name = "Kernel code", .start = 0, .end = 0 },
-        /* These must be last in the array */
-        { .name = "Kernel data", .start = 0, .end = 0 }
-};
-
-struct resource xram_resources[] = {
-        /* To be updated with external devices */
-};
-
-struct resource rom_resources[] = {
-        /* To be updated with external devices */
-};
-
-struct sh64_platform platform_parms = {
-        .readonly_rootfs =      1,
-        .initial_root_dev =     0x0100,
-        .loader_type =          1,
-        .io_res_p =             io_resources,
-        .io_res_count =         ARRAY_SIZE(io_resources),
-        .kram_res_p =           kram_resources,
-        .kram_res_count =       ARRAY_SIZE(kram_resources),
-        .xram_res_p =           xram_resources,
-        .xram_res_count =       ARRAY_SIZE(xram_resources),
-        .rom_res_p =            rom_resources,
-        .rom_res_count =        ARRAY_SIZE(rom_resources),
-};
-
-int platform_int_priority[NR_INTC_IRQS] = {
-        IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ  0- 7 */
-        RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ  8-15 */
-        PW1, PW0, DM0, DM1, DM2, DM3, DAE, RES, /* IRQ 16-23 */
-        RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 24-31 */
-        TU0, TU1, TU2, TI2, ATI, PRI, CUI, ERI, /* IRQ 32-39 */
-        RXI, BRI, TXI, RES, RES, RES, RES, RES, /* IRQ 40-47 */
-        RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 48-55 */
-        RES, RES, RES, RES, RES, RES, RES, ITI, /* IRQ 56-63 */
-};
-
-void __init platform_setup(void)
-{
-        /* Harp platform leaves the decision to head.S, for now */
-        platform_parms.fpu_flags = fpu_in_use;
-}
-
-void __init platform_monitor(void)
-{
-        /* Nothing yet .. */
-}
-
-void __init platform_reserve(void)
-{
-        /* Nothing yet .. */
-}
-
-const char *get_system_type(void)
-{
-        return "ST50 Harp";
-}
diff --git a/arch/sh64/mach-sim/Makefile b/arch/sh64/mach-sim/Makefile
deleted file mode 100644
index 2f2963fa2131..000000000000
--- a/arch/sh64/mach-sim/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y := setup.o
diff --git a/arch/sh64/mach-sim/setup.c b/arch/sh64/mach-sim/setup.c
deleted file mode 100644
index e3386ec1ce1f..000000000000
--- a/arch/sh64/mach-sim/setup.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/mach-sim/setup.c
- *
- * ST50 Simulator Platform Support
- *
- * This file handles the architecture-dependent parts of initialization
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * lethal@linux-sh.org:          15th May 2003
- *    Use the generic procfs cpuinfo interface, just return a valid board name.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <asm/platform.h>
-#include <asm/irq.h>
-
-/*
- * Platform Dependent Interrupt Priorities.
- */
-
-/* Using defaults defined in irq.h */
-#define RES NO_PRIORITY         /* Disabled */
-#define IR0 IRL0_PRIORITY       /* IRLs */
-#define IR1 IRL1_PRIORITY
-#define IR2 IRL2_PRIORITY
-#define IR3 IRL3_PRIORITY
-#define PCA INTA_PRIORITY       /* PCI Ints */
-#define PCB INTB_PRIORITY
-#define PCC INTC_PRIORITY
-#define PCD INTD_PRIORITY
-#define SER TOP_PRIORITY
-#define ERR TOP_PRIORITY
-#define PW0 TOP_PRIORITY
-#define PW1 TOP_PRIORITY
-#define PW2 TOP_PRIORITY
-#define PW3 TOP_PRIORITY
-#define DM0 NO_PRIORITY         /* DMA Ints */
-#define DM1 NO_PRIORITY
-#define DM2 NO_PRIORITY
-#define DM3 NO_PRIORITY
-#define DAE NO_PRIORITY
-#define TU0 TIMER_PRIORITY      /* TMU Ints */
-#define TU1 NO_PRIORITY
-#define TU2 NO_PRIORITY
-#define TI2 NO_PRIORITY
-#define ATI NO_PRIORITY         /* RTC Ints */
-#define PRI NO_PRIORITY
-#define CUI RTC_PRIORITY
-#define ERI SCIF_PRIORITY       /* SCIF Ints */
-#define RXI SCIF_PRIORITY
-#define BRI SCIF_PRIORITY
-#define TXI SCIF_PRIORITY
-#define ITI TOP_PRIORITY        /* WDT Ints */
-
-/*
- * Platform dependent structures: maps and parms block.
- */
-struct resource io_resources[] = {
-        /* Nothing yet .. */
-};
-
-struct resource kram_resources[] = {
-        /* These must be last in the array */
-        { .name = "Kernel code", .start = 0, .end = 0 },
-        /* These must be last in the array */
-        { .name = "Kernel data", .start = 0, .end = 0 }
-};
-
-struct resource xram_resources[] = {
-        /* Nothing yet .. */
-};
-
-struct resource rom_resources[] = {
-        /* Nothing yet .. */
-};
-
-struct sh64_platform platform_parms = {
-        .readonly_rootfs =      1,
-        .initial_root_dev =     0x0100,
-        .loader_type =          1,
-        .io_res_p =             io_resources,
-        .io_res_count =         ARRAY_SIZE(io_resources),
-        .kram_res_p =           kram_resources,
-        .kram_res_count =       ARRAY_SIZE(kram_resources),
-        .xram_res_p =           xram_resources,
-        .xram_res_count =       ARRAY_SIZE(xram_resources),
-        .rom_res_p =            rom_resources,
-        .rom_res_count =        ARRAY_SIZE(rom_resources),
-};
-
-int platform_int_priority[NR_IRQS] = {
-        IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ  0- 7 */
-        RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ  8-15 */
-        PW1, PW0, DM0, DM1, DM2, DM3, DAE, RES, /* IRQ 16-23 */
-        RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 24-31 */
-        TU0, TU1, TU2, TI2, ATI, PRI, CUI, ERI, /* IRQ 32-39 */
-        RXI, BRI, TXI, RES, RES, RES, RES, RES, /* IRQ 40-47 */
-        RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 48-55 */
-        RES, RES, RES, RES, RES, RES, RES, ITI, /* IRQ 56-63 */
-};
-
-void __init platform_setup(void)
-{
-        /* Simulator platform leaves the decision to head.S */
-        platform_parms.fpu_flags = fpu_in_use;
-}
-
-void __init platform_monitor(void)
-{
-        /* Nothing yet .. */
-}
-
-void __init platform_reserve(void)
-{
-        /* Nothing yet .. */
-}
-
-const char *get_system_type(void)
-{
-        return "SH-5 Simulator";
-}
diff --git a/arch/sh64/mm/consistent.c b/arch/sh64/mm/consistent.c
deleted file mode 100644
index c439620402cb..000000000000
--- a/arch/sh64/mm/consistent.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2001 David J. Mckay (david.mckay@st.com)
- * Copyright (C) 2003 Paul Mundt (lethal@linux-sh.org)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Dynamic DMA mapping support.
- */
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <linux/module.h>
-#include <asm/io.h>
-
-void *consistent_alloc(struct pci_dev *hwdev, size_t size,
-                           dma_addr_t *dma_handle)
-{
-        void *ret;
-        int gfp = GFP_ATOMIC;
-        void *vp;
-
-        if (hwdev == NULL || hwdev->dma_mask != 0xffffffff)
-                gfp |= GFP_DMA;
-
-        ret = (void *)__get_free_pages(gfp, get_order(size));
-
-        /* now call our friend ioremap_nocache to give us an uncached area */
-        vp = ioremap_nocache(virt_to_phys(ret), size);
-
-        if (vp != NULL) {
-                memset(vp, 0, size);
-                *dma_handle = virt_to_phys(ret);
-                dma_cache_sync(NULL, ret, size, DMA_BIDIRECTIONAL);
-        }
-
-        return vp;
-}
-EXPORT_SYMBOL(consistent_alloc);
-
-void consistent_free(struct pci_dev *hwdev, size_t size,
-                         void *vaddr, dma_addr_t dma_handle)
-{
-        void *alloc;
-
-        alloc = phys_to_virt((unsigned long)dma_handle);
-        free_pages((unsigned long)alloc, get_order(size));
-
-        iounmap(vaddr);
-}
-EXPORT_SYMBOL(consistent_free);
diff --git a/arch/sh64/mm/hugetlbpage.c b/arch/sh64/mm/hugetlbpage.c
deleted file mode 100644
index fa66daa2dfa9..000000000000
--- a/arch/sh64/mm/hugetlbpage.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * arch/sh64/mm/hugetlbpage.c
- *
- * SuperH HugeTLB page support.
- *
- * Cloned from sparc64 by Paul Mundt.
- *
- * Copyright (C) 2002, 2003 David S. Miller (davem@redhat.com)
- */
-
-#include <linux/init.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/hugetlb.h>
-#include <linux/pagemap.h>
-#include <linux/slab.h>
-#include <linux/sysctl.h>
-
-#include <asm/mman.h>
-#include <asm/pgalloc.h>
-#include <asm/tlb.h>
-#include <asm/tlbflush.h>
-#include <asm/cacheflush.h>
-
-pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)
-{
-        pgd_t *pgd;
-        pmd_t *pmd;
-        pte_t *pte = NULL;
-
-        pgd = pgd_offset(mm, addr);
-        if (pgd) {
-                pmd = pmd_alloc(mm, pgd, addr);
-                if (pmd)
-                        pte = pte_alloc_map(mm, pmd, addr);
-        }
-        return pte;
-}
-
-pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
-{
-        pgd_t *pgd;
-        pmd_t *pmd;
-        pte_t *pte = NULL;
-
-        pgd = pgd_offset(mm, addr);
-        if (pgd) {
-                pmd = pmd_offset(pgd, addr);
-                if (pmd)
-                        pte = pte_offset_map(pmd, addr);
-        }
-        return pte;
-}
-
-int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
-{
-        return 0;
-}
-
-void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
-                     pte_t *ptep, pte_t entry)
-{
-        int i;
-
-        for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {
-                set_pte_at(mm, addr, ptep, entry);
-                ptep++;
-                addr += PAGE_SIZE;
-                pte_val(entry) += PAGE_SIZE;
-        }
-}
-
-pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
-                              pte_t *ptep)
-{
-        pte_t entry;
-        int i;
-
-        entry = *ptep;
-
-        for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {
-                pte_clear(mm, addr, ptep);
-                addr += PAGE_SIZE;
-                ptep++;
-        }
-
-        return entry;
-}
-
-struct page *follow_huge_addr(struct mm_struct *mm,
-                              unsigned long address, int write)
-{
-        return ERR_PTR(-EINVAL);
-}
-
-int pmd_huge(pmd_t pmd)
-{
-        return 0;
-}
-
-struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
-                             pmd_t *pmd, int write)
-{
-        return NULL;
-}
diff --git a/arch/sh64/mm/init.c b/arch/sh64/mm/init.c
deleted file mode 100644
index 21cf42de23e2..000000000000
--- a/arch/sh64/mm/init.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/mm/init.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- *
- */
-
-#include <linux/init.h>
-#include <linux/rwsem.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <linux/bootmem.h>
-
-#include <asm/mmu_context.h>
-#include <asm/page.h>
-#include <asm/pgalloc.h>
-#include <asm/pgtable.h>
-#include <asm/tlb.h>
-
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
-/*
- * Cache of MMU context last used.
- */
-unsigned long mmu_context_cache;
-pgd_t * mmu_pdtp_cache;
-int after_bootmem = 0;
-
-/*
- * BAD_PAGE is the page that is used for page faults when linux
- * is out-of-memory. Older versions of linux just did a
- * do_exit(), but using this instead means there is less risk
- * for a process dying in kernel mode, possibly leaving an inode
- * unused etc..
- *
- * BAD_PAGETABLE is the accompanying page-table: it is initialized
- * to point to BAD_PAGE entries.
- *
- * ZERO_PAGE is a special page that is used for zero-initialized
- * data and COW.
- */
-
-extern unsigned char empty_zero_page[PAGE_SIZE];
-extern unsigned char empty_bad_page[PAGE_SIZE];
-extern pte_t empty_bad_pte_table[PTRS_PER_PTE];
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-
-extern char _text, _etext, _edata, __bss_start, _end;
-extern char __init_begin, __init_end;
-
-/* It'd be good if these lines were in the standard header file. */
-#define START_PFN       (NODE_DATA(0)->bdata->node_boot_start >> PAGE_SHIFT)
-#define MAX_LOW_PFN     (NODE_DATA(0)->bdata->node_low_pfn)
-
-
-void show_mem(void)
-{
-        int i, total = 0, reserved = 0;
-        int shared = 0, cached = 0;
-
-        printk("Mem-info:\n");
-        show_free_areas();
-        printk("Free swap:       %6ldkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
-        i = max_mapnr;
-        while (i-- > 0) {
-                total++;
-                if (PageReserved(mem_map+i))
-                        reserved++;
-                else if (PageSwapCache(mem_map+i))
-                        cached++;
-                else if (page_count(mem_map+i))
-                        shared += page_count(mem_map+i) - 1;
-        }
-        printk("%d pages of RAM\n",total);
-        printk("%d reserved pages\n",reserved);
-        printk("%d pages shared\n",shared);
-        printk("%d pages swap cached\n",cached);
-        printk("%ld pages in page table cache\n", quicklist_total_size());
-}
-
-/*
- * paging_init() sets up the page tables.
- *
- * head.S already did a lot to set up address translation for the kernel.
- * Here we comes with:
- * . MMU enabled
- * . ASID set (SR)
- * .  some 512MB regions being mapped of which the most relevant here is:
- *   . CACHED segment (ASID 0 [irrelevant], shared AND NOT user)
- * . possible variable length regions being mapped as:
- *   . UNCACHED segment (ASID 0 [irrelevant], shared AND NOT user)
- * . All of the memory regions are placed, independently from the platform
- *   on high addresses, above 0x80000000.
- * . swapper_pg_dir is already cleared out by the .space directive
- *   in any case swapper does not require a real page directory since
- *   it's all kernel contained.
- *
- * Those pesky NULL-reference errors in the kernel are then
- * dealt with by not mapping address 0x00000000 at all.
- *
- */
-void __init paging_init(void)
-{
-        unsigned long zones_size[MAX_NR_ZONES] = {0, };
-
-        pgd_init((unsigned long)swapper_pg_dir);
-        pgd_init((unsigned long)swapper_pg_dir +
-                 sizeof(pgd_t) * USER_PTRS_PER_PGD);
-
-        mmu_context_cache = MMU_CONTEXT_FIRST_VERSION;
-
-        zones_size[ZONE_NORMAL] = MAX_LOW_PFN - START_PFN;
-        NODE_DATA(0)->node_mem_map = NULL;
-        free_area_init_node(0, NODE_DATA(0), zones_size, __MEMORY_START >> PAGE_SHIFT, 0);
-}
-
-void __init mem_init(void)
-{
-        int codesize, reservedpages, datasize, initsize;
-        int tmp;
-
-        max_mapnr = num_physpages = MAX_LOW_PFN - START_PFN;
-        high_memory = (void *)__va(MAX_LOW_PFN * PAGE_SIZE);
-
-        /*
-         * Clear the zero-page.
-         * This is not required but we might want to re-use
-         * this very page to pass boot parameters, one day.
-         */
-        memset(empty_zero_page, 0, PAGE_SIZE);
-
-        /* this will put all low memory onto the freelists */
-        totalram_pages += free_all_bootmem_node(NODE_DATA(0));
-        reservedpages = 0;
-        for (tmp = 0; tmp < num_physpages; tmp++)
-                /*
-                 * Only count reserved RAM pages
-                 */
-                if (PageReserved(mem_map+tmp))
-                        reservedpages++;
-
-        after_bootmem = 1;
-
-        codesize =  (unsigned long) &_etext - (unsigned long) &_text;
-        datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
-        initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
-
-        printk("Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n",
-                (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
-                max_mapnr << (PAGE_SHIFT-10),
-                codesize >> 10,
-                reservedpages << (PAGE_SHIFT-10),
-                datasize >> 10,
-                initsize >> 10);
-}
-
-void free_initmem(void)
-{
-        unsigned long addr;
-
-        addr = (unsigned long)(&__init_begin);
-        for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        printk ("Freeing unused kernel memory: %ldk freed\n", (&__init_end - &__init_begin) >> 10);
-}
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-        unsigned long p;
-        for (p = start; p < end; p += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(p));
-                init_page_count(virt_to_page(p));
-                free_page(p);
-                totalram_pages++;
-        }
-        printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
-}
-#endif
-
diff --git a/arch/sh64/oprofile/Makefile b/arch/sh64/oprofile/Makefile
deleted file mode 100644
index 11a451f6a9c3..000000000000
--- a/arch/sh64/oprofile/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-obj-$(CONFIG_OPROFILE) += oprofile.o
-
-DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
-                oprof.o cpu_buffer.o buffer_sync.o \
-                event_buffer.o oprofile_files.o \
-                oprofilefs.o oprofile_stats.o \
-                timer_int.o )
-
-profdrvr-y                              := op_model_null.o
-
-oprofile-y                              := $(DRIVER_OBJS) $(profdrvr-y)
-
diff --git a/arch/sh64/oprofile/op_model_null.c b/arch/sh64/oprofile/op_model_null.c
deleted file mode 100644
index a750ea1fee98..000000000000
--- a/arch/sh64/oprofile/op_model_null.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * arch/sh64/oprofile/op_model_null.c
- *
- * Copyright (C) 2003  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/kernel.h>
-#include <linux/oprofile.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-
-int __init oprofile_arch_init(struct oprofile_operations *ops)
-{
-        return -ENODEV;
-}
-
-void oprofile_arch_exit(void)
-{
-}
-
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 4d0119ea9e35..f2122855d4ec 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -105,6 +105,17 @@ config PARIDE
           "MicroSolutions backpack protocol", "DataStor Commuter protocol"
           etc.).
 
+config GDROM
+        tristate "SEGA Dreamcast GD-ROM drive"
+        depends on SH_DREAMCAST
+        help
+          A standard SEGA Dreamcast comes with a modified CD ROM drive called a
+          "GD-ROM" by SEGA to signify it is capable of reading special disks
+          with up to 1 GB of data. This drive will also read standard CD ROM
+          disks. Select this option to access any disks in your GD ROM drive.
+          Most users will want to say "Y" here.
+          You can also build this as a module which will be called gdrom.ko
+
 source "drivers/block/paride/Kconfig"
 
 config BLK_CPQ_DA
diff --git a/drivers/cdrom/Makefile b/drivers/cdrom/Makefile
index 774c180a4e11..ecf85fda0fc1 100644
--- a/drivers/cdrom/Makefile
+++ b/drivers/cdrom/Makefile
@@ -11,3 +11,4 @@ obj-$(CONFIG_PARIDE_PCD)	+=		cdrom.o
 obj-$(CONFIG_CDROM_PKTCDVD)     +=              cdrom.o
 
 obj-$(CONFIG_VIOCD)             += viocd.o      cdrom.o
+obj-$(CONFIG_GDROM)             += gdrom.o      cdrom.o
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
new file mode 100644
index 000000000000..4e2bbcccc064
--- /dev/null
+++ b/drivers/cdrom/gdrom.c
@@ -0,0 +1,867 @@
+/* GD ROM driver for the SEGA Dreamcast
+ * copyright Adrian McMenamin, 2007
+ * With thanks to Marcus Comstedt and Nathan Keynes
+ * for work in reversing PIO and DMA
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/dma-mapping.h>
+#include <linux/cdrom.h>
+#include <linux/genhd.h>
+#include <linux/bio.h>
+#include <linux/blkdev.h>
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <linux/wait.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+#include <scsi/scsi.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <asm/delay.h>
+#include <asm/mach/dma.h>
+#include <asm/mach/sysasic.h>
+
+#define GDROM_DEV_NAME "gdrom"
+#define GD_SESSION_OFFSET 150
+
+/* GD Rom commands */
+#define GDROM_COM_SOFTRESET 0x08
+#define GDROM_COM_EXECDIAG 0x90
+#define GDROM_COM_PACKET 0xA0
+#define GDROM_COM_IDDEV 0xA1
+
+/* GD Rom registers */
+#define GDROM_BASE_REG                  0xA05F7000
+#define GDROM_ALTSTATUS_REG             (GDROM_BASE_REG + 0x18)
+#define GDROM_DATA_REG                  (GDROM_BASE_REG + 0x80)
+#define GDROM_ERROR_REG         (GDROM_BASE_REG + 0x84)
+#define GDROM_INTSEC_REG                (GDROM_BASE_REG + 0x88)
+#define GDROM_SECNUM_REG                (GDROM_BASE_REG + 0x8C)
+#define GDROM_BCL_REG                   (GDROM_BASE_REG + 0x90)
+#define GDROM_BCH_REG                   (GDROM_BASE_REG + 0x94)
+#define GDROM_DSEL_REG                  (GDROM_BASE_REG + 0x98)
+#define GDROM_STATUSCOMMAND_REG (GDROM_BASE_REG + 0x9C)
+#define GDROM_RESET_REG         (GDROM_BASE_REG + 0x4E4)
+
+#define GDROM_DMA_STARTADDR_REG (GDROM_BASE_REG + 0x404)
+#define GDROM_DMA_LENGTH_REG            (GDROM_BASE_REG + 0x408)
+#define GDROM_DMA_DIRECTION_REG (GDROM_BASE_REG + 0x40C)
+#define GDROM_DMA_ENABLE_REG            (GDROM_BASE_REG + 0x414)
+#define GDROM_DMA_STATUS_REG            (GDROM_BASE_REG + 0x418)
+#define GDROM_DMA_WAIT_REG              (GDROM_BASE_REG + 0x4A0)
+#define GDROM_DMA_ACCESS_CTRL_REG       (GDROM_BASE_REG + 0x4B8)
+
+#define GDROM_HARD_SECTOR       2048
+#define BLOCK_LAYER_SECTOR      512
+#define GD_TO_BLK               4
+
+#define GDROM_DEFAULT_TIMEOUT   (HZ * 7)
+
+static const struct {
+        int sense_key;
+        const char * const text;
+} sense_texts[] = {
+        {NO_SENSE, "OK"},
+        {RECOVERED_ERROR, "Recovered from error"},
+        {NOT_READY, "Device not ready"},
+        {MEDIUM_ERROR, "Disk not ready"},
+        {HARDWARE_ERROR, "Hardware error"},
+        {ILLEGAL_REQUEST, "Command has failed"},
+        {UNIT_ATTENTION, "Device needs attention - disk may have been changed"},
+        {DATA_PROTECT, "Data protection error"},
+        {ABORTED_COMMAND, "Command aborted"},
+};
+
+static struct platform_device *pd;
+static int gdrom_major;
+static DECLARE_WAIT_QUEUE_HEAD(command_queue);
+static DECLARE_WAIT_QUEUE_HEAD(request_queue);
+
+static DEFINE_SPINLOCK(gdrom_lock);
+static void gdrom_readdisk_dma(struct work_struct *work);
+static DECLARE_WORK(work, gdrom_readdisk_dma);
+static LIST_HEAD(gdrom_deferred);
+
+struct gdromtoc {
+        unsigned int entry[99];
+        unsigned int first, last;
+        unsigned int leadout;
+};
+
+static struct gdrom_unit {
+        struct gendisk *disk;
+        struct cdrom_device_info *cd_info;
+        int status;
+        int pending;
+        int transfer;
+        char disk_type;
+        struct gdromtoc *toc;
+        struct request_queue *gdrom_rq;
+} gd;
+
+struct gdrom_id {
+        char mid;
+        char modid;
+        char verid;
+        char padA[13];
+        char mname[16];
+        char modname[16];
+        char firmver[16];
+        char padB[16];
+};
+
+static int gdrom_getsense(short *bufstring);
+static int gdrom_packetcommand(struct cdrom_device_info *cd_info,
+        struct packet_command *command);
+static int gdrom_hardreset(struct cdrom_device_info *cd_info);
+
+static bool gdrom_is_busy(void)
+{
+        return (ctrl_inb(GDROM_ALTSTATUS_REG) & 0x80) != 0;
+}
+
+static bool gdrom_data_request(void)
+{
+        return (ctrl_inb(GDROM_ALTSTATUS_REG) & 0x88) == 8;
+}
+
+static bool gdrom_wait_clrbusy(void)
+{
+        unsigned long timeout = jiffies + GDROM_DEFAULT_TIMEOUT;
+        while ((ctrl_inb(GDROM_ALTSTATUS_REG) & 0x80) &&
+                (time_before(jiffies, timeout)))
+                cpu_relax();
+        return time_before(jiffies, timeout + 1);
+}
+
+static bool gdrom_wait_busy_sleeps(void)
+{
+        unsigned long timeout;
+        /* Wait to get busy first */
+        timeout = jiffies + GDROM_DEFAULT_TIMEOUT;
+        while (!gdrom_is_busy() && time_before(jiffies, timeout))
+                cpu_relax();
+        /* Now wait for busy to clear */
+        return gdrom_wait_clrbusy();
+}
+
+static void gdrom_identifydevice(void *buf)
+{
+        int c;
+        short *data = buf;
+        /* If the device won't clear it has probably
+        * been hit by a serious failure - but we'll
+        * try to return a sense key even so */
+        if (!gdrom_wait_clrbusy()) {
+                gdrom_getsense(NULL);
+                return;
+        }
+        ctrl_outb(GDROM_COM_IDDEV, GDROM_STATUSCOMMAND_REG);
+        if (!gdrom_wait_busy_sleeps()) {
+                gdrom_getsense(NULL);
+                return;
+        }
+        /* now read in the data */
+        for (c = 0; c < 40; c++)
+                data[c] = ctrl_inw(GDROM_DATA_REG);
+}
+
+static void gdrom_spicommand(void *spi_string, int buflen)
+{
+        short *cmd = spi_string;
+        unsigned long timeout;
+
+        /* ensure IRQ_WAIT is set */
+        ctrl_outb(0x08, GDROM_ALTSTATUS_REG);
+        /* specify how many bytes we expect back */
+        ctrl_outb(buflen & 0xFF, GDROM_BCL_REG);
+        ctrl_outb((buflen >> 8) & 0xFF, GDROM_BCH_REG);
+        /* other parameters */
+        ctrl_outb(0, GDROM_INTSEC_REG);
+        ctrl_outb(0, GDROM_SECNUM_REG);
+        ctrl_outb(0, GDROM_ERROR_REG);
+        /* Wait until we can go */
+        if (!gdrom_wait_clrbusy()) {
+                gdrom_getsense(NULL);
+                return;
+        }
+        timeout = jiffies + GDROM_DEFAULT_TIMEOUT;
+        ctrl_outb(GDROM_COM_PACKET, GDROM_STATUSCOMMAND_REG);
+        while (!gdrom_data_request() && time_before(jiffies, timeout))
+                cpu_relax();
+        if (!time_before(jiffies, timeout + 1)) {
+                gdrom_getsense(NULL);
+                return;
+        }
+        outsw(PHYSADDR(GDROM_DATA_REG), cmd, 6);
+}
+
+
+/* gdrom_command_executediagnostic:
+ * Used to probe for presence of working GDROM
+ * Restarts GDROM device and then applies standard ATA 3
+ * Execute Diagnostic Command: a return of '1' indicates device 0
+ * present and device 1 absent
+ */
+static char gdrom_execute_diagnostic(void)
+{
+        gdrom_hardreset(gd.cd_info);
+        if (!gdrom_wait_clrbusy())
+                return 0;
+        ctrl_outb(GDROM_COM_EXECDIAG, GDROM_STATUSCOMMAND_REG);
+        if (!gdrom_wait_busy_sleeps())
+                return 0;
+        return ctrl_inb(GDROM_ERROR_REG);
+}
+
+/*
+ * Prepare disk command
+ * byte 0 = 0x70
+ * byte 1 = 0x1f
+ */
+static int gdrom_preparedisk_cmd(void)
+{
+        struct packet_command *spin_command;
+        spin_command = kzalloc(sizeof(struct packet_command), GFP_KERNEL);
+        if (!spin_command)
+                return -ENOMEM;
+        spin_command->cmd[0] = 0x70;
+        spin_command->cmd[2] = 0x1f;
+        spin_command->buflen = 0;
+        gd.pending = 1;
+        gdrom_packetcommand(gd.cd_info, spin_command);
+        /* 60 second timeout */
+        wait_event_interruptible_timeout(command_queue, gd.pending == 0,
+                GDROM_DEFAULT_TIMEOUT);
+        gd.pending = 0;
+        kfree(spin_command);
+        if (gd.status & 0x01) {
+                /* log an error */
+                gdrom_getsense(NULL);
+                return -EIO;
+        }
+        return 0;
+}
+
+/*
+ * Read TOC command
+ * byte 0 = 0x14
+ * byte 1 = session
+ * byte 3 = sizeof TOC >> 8  ie upper byte
+ * byte 4 = sizeof TOC & 0xff ie lower byte
+ */
+static int gdrom_readtoc_cmd(struct gdromtoc *toc, int session)
+{
+        int tocsize;
+        struct packet_command *toc_command;
+        int err = 0;
+
+        toc_command = kzalloc(sizeof(struct packet_command), GFP_KERNEL);
+        if (!toc_command)
+                return -ENOMEM;
+        tocsize = sizeof(struct gdromtoc);
+        toc_command->cmd[0] = 0x14;
+        toc_command->cmd[1] = session;
+        toc_command->cmd[3] = tocsize >> 8;
+        toc_command->cmd[4] = tocsize & 0xff;
+        toc_command->buflen = tocsize;
+        if (gd.pending) {
+                err = -EBUSY;
+                goto cleanup_readtoc_final;
+        }
+        gd.pending = 1;
+        gdrom_packetcommand(gd.cd_info, toc_command);
+        wait_event_interruptible_timeout(command_queue, gd.pending == 0,
+                GDROM_DEFAULT_TIMEOUT);
+        if (gd.pending) {
+                err = -EINVAL;
+                goto cleanup_readtoc;
+        }
+        insw(PHYSADDR(GDROM_DATA_REG), toc, tocsize/2);
+        if (gd.status & 0x01)
+                err = -EINVAL;
+
+cleanup_readtoc:
+        gd.pending = 0;
+cleanup_readtoc_final:
+        kfree(toc_command);
+        return err;
+}
+
+/* TOC helpers */
+static int get_entry_lba(int track)
+{
+        return (cpu_to_be32(track & 0xffffff00) - GD_SESSION_OFFSET);
+}
+
+static int get_entry_q_ctrl(int track)
+{
+        return (track & 0x000000f0) >> 4;
+}
+
+static int get_entry_track(int track)
+{
+        return (track & 0x0000ff00) >> 8;
+}
+
+static int gdrom_get_last_session(struct cdrom_device_info *cd_info,
+        struct cdrom_multisession *ms_info)
+{
+        int fentry, lentry, track, data, tocuse, err;
+        if (!gd.toc)
+                return -ENOMEM;
+        tocuse = 1;
+        /* Check if GD-ROM */
+        err = gdrom_readtoc_cmd(gd.toc, 1);
+        /* Not a GD-ROM so check if standard CD-ROM */
+        if (err) {
+                tocuse = 0;
+                err = gdrom_readtoc_cmd(gd.toc, 0);
+                if (err) {
+                        printk(KERN_INFO "GDROM: Could not get CD "
+                                "table of contents\n");
+                        return -ENXIO;
+                }
+        }
+
+        fentry = get_entry_track(gd.toc->first);
+        lentry = get_entry_track(gd.toc->last);
+        /* Find the first data track */
+        track = get_entry_track(gd.toc->last);
+        do {
+                data = gd.toc->entry[track - 1];
+                if (get_entry_q_ctrl(data))
+                        break;  /* ie a real data track */
+                track--;
+        } while (track >= fentry);
+
+        if ((track > 100) || (track < get_entry_track(gd.toc->first))) {
+                printk(KERN_INFO "GDROM: No data on the last "
+                        "session of the CD\n");
+                gdrom_getsense(NULL);
+                return -ENXIO;
+        }
+
+        ms_info->addr_format = CDROM_LBA;
+        ms_info->addr.lba = get_entry_lba(data);
+        ms_info->xa_flag = 1;
+        return 0;
+}
+
+static int gdrom_open(struct cdrom_device_info *cd_info, int purpose)
+{
+        /* spin up the disk */
+        return gdrom_preparedisk_cmd();
+}
+
+/* this function is required even if empty */
+static void gdrom_release(struct cdrom_device_info *cd_info)
+{
+}
+
+static int gdrom_drivestatus(struct cdrom_device_info *cd_info, int ignore)
+{
+        /* read the sense key */
+        char sense = ctrl_inb(GDROM_ERROR_REG);
+        sense &= 0xF0;
+        if (sense == 0)
+                return CDS_DISC_OK;
+        if (sense == 0x20)
+                return CDS_DRIVE_NOT_READY;
+        /* default */
+        return CDS_NO_INFO;
+}
+
+static int gdrom_mediachanged(struct cdrom_device_info *cd_info, int ignore)
+{
+        /* check the sense key */
+        return (ctrl_inb(GDROM_ERROR_REG) & 0xF0) == 0x60;
+}
+
+/* reset the G1 bus */
+static int gdrom_hardreset(struct cdrom_device_info *cd_info)
+{
+        int count;
+        ctrl_outl(0x1fffff, GDROM_RESET_REG);
+        for (count = 0xa0000000; count < 0xa0200000; count += 4)
+                ctrl_inl(count);
+        return 0;
+}
+
+/* keep the function looking like the universal
+ * CD Rom specification  - returning int */
+static int gdrom_packetcommand(struct cdrom_device_info *cd_info,
+        struct packet_command *command)
+{
+        gdrom_spicommand(&command->cmd, command->buflen);
+        return 0;
+}
+
+/* Get Sense SPI command
+ * From Marcus Comstedt
+ * cmd = 0x13
+ * cmd + 4 = length of returned buffer
+ * Returns 5 16 bit words
+ */
+static int gdrom_getsense(short *bufstring)
+{
+        struct packet_command *sense_command;
+        short sense[5];
+        int sense_key;
+        int err = -EIO;
+
+        sense_command = kzalloc(sizeof(struct packet_command), GFP_KERNEL);
+        if (!sense_command)
+                return -ENOMEM;
+        sense_command->cmd[0] = 0x13;
+        sense_command->cmd[4] = 10;
+        sense_command->buflen = 10;
+        /* even if something is pending try to get
+        * the sense key if possible */
+        if (gd.pending && !gdrom_wait_clrbusy()) {
+                err = -EBUSY;
+                goto cleanup_sense_final;
+        }
+        gd.pending = 1;
+        gdrom_packetcommand(gd.cd_info, sense_command);
+        wait_event_interruptible_timeout(command_queue, gd.pending == 0,
+                GDROM_DEFAULT_TIMEOUT);
+        if (gd.pending)
+                goto cleanup_sense;
+        insw(PHYSADDR(GDROM_DATA_REG), &sense, sense_command->buflen/2);
+        if (sense[1] & 40) {
+                printk(KERN_INFO "GDROM: Drive not ready - command aborted\n");
+                goto cleanup_sense;
+        }
+        sense_key = sense[1] & 0x0F;
+        if (sense_key < ARRAY_SIZE(sense_texts))
+                printk(KERN_INFO "GDROM: %s\n", sense_texts[sense_key].text);
+        else
+                printk(KERN_ERR "GDROM: Unknown sense key: %d\n", sense_key);
+        if (bufstring) /* return addional sense data */
+                memcpy(bufstring, &sense[4], 2);
+        if (sense_key < 2)
+                err = 0;
+
+cleanup_sense:
+        gd.pending = 0;
+cleanup_sense_final:
+        kfree(sense_command);
+        return err;
+}
+
+static struct cdrom_device_ops gdrom_ops = {
+        .open                   = gdrom_open,
+        .release                = gdrom_release,
+        .drive_status           = gdrom_drivestatus,
+        .media_changed          = gdrom_mediachanged,
+        .get_last_session       = gdrom_get_last_session,
+        .reset                  = gdrom_hardreset,
+        .capability             = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
+                                  CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
+        .n_minors               = 1,
+};
+
+static int gdrom_bdops_open(struct inode *inode, struct file *file)
+{
+        return cdrom_open(gd.cd_info, inode, file);
+}
+
+static int gdrom_bdops_release(struct inode *inode, struct file *file)
+{
+        return cdrom_release(gd.cd_info, file);
+}
+
+static int gdrom_bdops_mediachanged(struct gendisk *disk)
+{
+        return cdrom_media_changed(gd.cd_info);
+}
+
+static int gdrom_bdops_ioctl(struct inode *inode, struct file *file,
+        unsigned cmd, unsigned long arg)
+{
+        return cdrom_ioctl(file, gd.cd_info, inode, cmd, arg);
+}
+
+static struct block_device_operations gdrom_bdops = {
+        .owner                  = THIS_MODULE,
+        .open                   = gdrom_bdops_open,
+        .release                = gdrom_bdops_release,
+        .media_changed          = gdrom_bdops_mediachanged,
+        .ioctl                  = gdrom_bdops_ioctl,
+};
+
+static irqreturn_t gdrom_command_interrupt(int irq, void *dev_id)
+{
+        gd.status = ctrl_inb(GDROM_STATUSCOMMAND_REG);
+        if (gd.pending != 1)
+                return IRQ_HANDLED;
+        gd.pending = 0;
+        wake_up_interruptible(&command_queue);
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t gdrom_dma_interrupt(int irq, void *dev_id)
+{
+        gd.status = ctrl_inb(GDROM_STATUSCOMMAND_REG);
+        if (gd.transfer != 1)
+                return IRQ_HANDLED;
+        gd.transfer = 0;
+        wake_up_interruptible(&request_queue);
+        return IRQ_HANDLED;
+}
+
+static int __devinit gdrom_set_interrupt_handlers(void)
+{
+        int err;
+
+        err = request_irq(HW_EVENT_GDROM_CMD, gdrom_command_interrupt,
+                IRQF_DISABLED, "gdrom_command", &gd);
+        if (err)
+                return err;
+        err = request_irq(HW_EVENT_GDROM_DMA, gdrom_dma_interrupt,
+                IRQF_DISABLED, "gdrom_dma", &gd);
+        if (err)
+                free_irq(HW_EVENT_GDROM_CMD, &gd);
+        return err;
+}
+
+/* Implement DMA read using SPI command
+ * 0 -> 0x30
+ * 1 -> mode
+ * 2 -> block >> 16
+ * 3 -> block >> 8
+ * 4 -> block
+ * 8 -> sectors >> 16
+ * 9 -> sectors >> 8
+ * 10 -> sectors
+ */
+static void gdrom_readdisk_dma(struct work_struct *work)
+{
+        int err, block, block_cnt;
+        struct packet_command *read_command;
+        struct list_head *elem, *next;
+        struct request *req;
+        unsigned long timeout;
+
+        if (list_empty(&gdrom_deferred))
+                return;
+        read_command = kzalloc(sizeof(struct packet_command), GFP_KERNEL);
+        if (!read_command)
+                return; /* get more memory later? */
+        read_command->cmd[0] = 0x30;
+        read_command->cmd[1] = 0x20;
+        spin_lock(&gdrom_lock);
+        list_for_each_safe(elem, next, &gdrom_deferred) {
+                req = list_entry(elem, struct request, queuelist);
+                spin_unlock(&gdrom_lock);
+                block = req->sector/GD_TO_BLK + GD_SESSION_OFFSET;
+                block_cnt = req->nr_sectors/GD_TO_BLK;
+                ctrl_outl(PHYSADDR(req->buffer), GDROM_DMA_STARTADDR_REG);
+                ctrl_outl(block_cnt * GDROM_HARD_SECTOR, GDROM_DMA_LENGTH_REG);
+                ctrl_outl(1, GDROM_DMA_DIRECTION_REG);
+                ctrl_outl(1, GDROM_DMA_ENABLE_REG);
+                read_command->cmd[2] = (block >> 16) & 0xFF;
+                read_command->cmd[3] = (block >> 8) & 0xFF;
+                read_command->cmd[4] = block & 0xFF;
+                read_command->cmd[8] = (block_cnt >> 16) & 0xFF;
+                read_command->cmd[9] = (block_cnt >> 8) & 0xFF;
+                read_command->cmd[10] = block_cnt & 0xFF;
+                /* set for DMA */
+                ctrl_outb(1, GDROM_ERROR_REG);
+                /* other registers */
+                ctrl_outb(0, GDROM_SECNUM_REG);
+                ctrl_outb(0, GDROM_BCL_REG);
+                ctrl_outb(0, GDROM_BCH_REG);
+                ctrl_outb(0, GDROM_DSEL_REG);
+                ctrl_outb(0, GDROM_INTSEC_REG);
+                /* Wait for registers to reset after any previous activity */
+                timeout = jiffies + HZ / 2;
+                while (gdrom_is_busy() && time_before(jiffies, timeout))
+                        cpu_relax();
+                ctrl_outb(GDROM_COM_PACKET, GDROM_STATUSCOMMAND_REG);
+                timeout = jiffies + HZ / 2;
+                /* Wait for packet command to finish */
+                while (gdrom_is_busy() && time_before(jiffies, timeout))
+                        cpu_relax();
+                gd.pending = 1;
+                gd.transfer = 1;
+                outsw(PHYSADDR(GDROM_DATA_REG), &read_command->cmd, 6);
+                timeout = jiffies + HZ / 2;
+                /* Wait for any pending DMA to finish */
+                while (ctrl_inb(GDROM_DMA_STATUS_REG) &&
+                        time_before(jiffies, timeout))
+                        cpu_relax();
+                /* start transfer */
+                ctrl_outb(1, GDROM_DMA_STATUS_REG);
+                wait_event_interruptible_timeout(request_queue,
+                        gd.transfer == 0, GDROM_DEFAULT_TIMEOUT);
+                err = gd.transfer;
+                gd.transfer = 0;
+                gd.pending = 0;
+                /* now seek to take the request spinlock
+                * before handling ending the request */
+                spin_lock(&gdrom_lock);
+                list_del_init(&req->queuelist);
+                end_dequeued_request(req, 1 - err);
+        }
+        spin_unlock(&gdrom_lock);
+        kfree(read_command);
+}
+
+static void gdrom_request_handler_dma(struct request *req)
+{
+        /* dequeue, add to list of deferred work
+        * and then schedule workqueue */
+        blkdev_dequeue_request(req);
+        list_add_tail(&req->queuelist, &gdrom_deferred);
+        schedule_work(&work);
+}
+
+static void gdrom_request(struct request_queue *rq)
+{
+        struct request *req;
+
+        while ((req = elv_next_request(rq)) != NULL) {
+                if (!blk_fs_request(req)) {
+                        printk(KERN_DEBUG "GDROM: Non-fs request ignored\n");
+                        end_request(req, 0);
+                }
+                if (rq_data_dir(req) != READ) {
+                        printk(KERN_NOTICE "GDROM: Read only device -");
+                        printk(" write request ignored\n");
+                        end_request(req, 0);
+                }
+                if (req->nr_sectors)
+                        gdrom_request_handler_dma(req);
+                else
+                        end_request(req, 0);
+        }
+}
+
+/* Print string identifying GD ROM device */
+static int __devinit gdrom_outputversion(void)
+{
+        struct gdrom_id *id;
+        char *model_name, *manuf_name, *firmw_ver;
+        int err = -ENOMEM;
+
+        /* query device ID */
+        id = kzalloc(sizeof(struct gdrom_id), GFP_KERNEL);
+        if (!id)
+                return err;
+        gdrom_identifydevice(id);
+        model_name = kstrndup(id->modname, 16, GFP_KERNEL);
+        if (!model_name)
+                goto free_id;
+        manuf_name = kstrndup(id->mname, 16, GFP_KERNEL);
+        if (!manuf_name)
+                goto free_model_name;
+        firmw_ver = kstrndup(id->firmver, 16, GFP_KERNEL);
+        if (!firmw_ver)
+                goto free_manuf_name;
+        printk(KERN_INFO "GDROM: %s from %s with firmware %s\n",
+                model_name, manuf_name, firmw_ver);
+        err = 0;
+        kfree(firmw_ver);
+free_manuf_name:
+        kfree(manuf_name);
+free_model_name:
+        kfree(model_name);
+free_id:
+        kfree(id);
+        return err;
+}
+
+/* set the default mode for DMA transfer */
+static int __devinit gdrom_init_dma_mode(void)
+{
+        ctrl_outb(0x13, GDROM_ERROR_REG);
+        ctrl_outb(0x22, GDROM_INTSEC_REG);
+        if (!gdrom_wait_clrbusy())
+                return -EBUSY;
+        ctrl_outb(0xEF, GDROM_STATUSCOMMAND_REG);
+        if (!gdrom_wait_busy_sleeps())
+                return -EBUSY;
+        /* Memory protection setting for GDROM DMA
+        * Bits 31 - 16 security: 0x8843
+        * Bits 15 and 7 reserved (0)
+        * Bits 14 - 8 start of transfer range in 1 MB blocks OR'ed with 0x80
+        * Bits 6 - 0 end of transfer range in 1 MB blocks OR'ed with 0x80
+        * (0x40 | 0x80) = start range at 0x0C000000
+        * (0x7F | 0x80) = end range at 0x0FFFFFFF */
+        ctrl_outl(0x8843407F, GDROM_DMA_ACCESS_CTRL_REG);
+        ctrl_outl(9, GDROM_DMA_WAIT_REG); /* DMA word setting */
+        return 0;
+}
+
+static void __devinit probe_gdrom_setupcd(void)
+{
+        gd.cd_info->ops = &gdrom_ops;
+        gd.cd_info->capacity = 1;
+        strcpy(gd.cd_info->name, GDROM_DEV_NAME);
+        gd.cd_info->mask = CDC_CLOSE_TRAY|CDC_OPEN_TRAY|CDC_LOCK|
+                CDC_SELECT_DISC;
+}
+
+static void __devinit probe_gdrom_setupdisk(void)
+{
+        gd.disk->major = gdrom_major;
+        gd.disk->first_minor = 1;
+        gd.disk->minors = 1;
+        strcpy(gd.disk->disk_name, GDROM_DEV_NAME);
+}
+
+static int __devinit probe_gdrom_setupqueue(void)
+{
+        blk_queue_hardsect_size(gd.gdrom_rq, GDROM_HARD_SECTOR);
+        /* using DMA so memory will need to be contiguous */
+        blk_queue_max_hw_segments(gd.gdrom_rq, 1);
+        /* set a large max size to get most from DMA */
+        blk_queue_max_segment_size(gd.gdrom_rq, 0x40000);
+        gd.disk->queue = gd.gdrom_rq;
+        return gdrom_init_dma_mode();
+}
+
+/*
+ * register this as a block device and as compliant with the
+ * universal CD Rom driver interface
+ */
+static int __devinit probe_gdrom(struct platform_device *devptr)
+{
+        int err;
+        /* Start the device */
+        if (gdrom_execute_diagnostic() != 1) {
+                printk(KERN_WARNING "GDROM: ATA Probe for GDROM failed.\n");
+                return -ENODEV;
+        }
+        /* Print out firmware ID */
+        if (gdrom_outputversion())
+                return -ENOMEM;
+        /* Register GDROM */
+        gdrom_major = register_blkdev(0, GDROM_DEV_NAME);
+        if (gdrom_major <= 0)
+                return gdrom_major;
+        printk(KERN_INFO "GDROM: Registered with major number %d\n",
+                gdrom_major);
+        /* Specify basic properties of drive */
+        gd.cd_info = kzalloc(sizeof(struct cdrom_device_info), GFP_KERNEL);
+        if (!gd.cd_info) {
+                err = -ENOMEM;
+                goto probe_fail_no_mem;
+        }
+        probe_gdrom_setupcd();
+        gd.disk = alloc_disk(1);
+        if (!gd.disk) {
+                err = -ENODEV;
+                goto probe_fail_no_disk;
+        }
+        probe_gdrom_setupdisk();
+        if (register_cdrom(gd.cd_info)) {
+                err = -ENODEV;
+                goto probe_fail_cdrom_register;
+        }
+        gd.disk->fops = &gdrom_bdops;
+        /* latch on to the interrupt */
+        err = gdrom_set_interrupt_handlers();
+        if (err)
+                goto probe_fail_cmdirq_register;
+        gd.gdrom_rq = blk_init_queue(gdrom_request, &gdrom_lock);
+        if (!gd.gdrom_rq)
+                goto probe_fail_requestq;
+
+        err = probe_gdrom_setupqueue();
+        if (err)
+                goto probe_fail_toc;
+
+        gd.toc = kzalloc(sizeof(struct gdromtoc), GFP_KERNEL);
+        if (!gd.toc)
+                goto probe_fail_toc;
+        add_disk(gd.disk);
+        return 0;
+
+probe_fail_toc:
+        blk_cleanup_queue(gd.gdrom_rq);
+probe_fail_requestq:
+        free_irq(HW_EVENT_GDROM_DMA, &gd);
+        free_irq(HW_EVENT_GDROM_CMD, &gd);
+probe_fail_cmdirq_register:
+probe_fail_cdrom_register:
+        del_gendisk(gd.disk);
+probe_fail_no_disk:
+        kfree(gd.cd_info);
+        unregister_blkdev(gdrom_major, GDROM_DEV_NAME);
+        gdrom_major = 0;
+probe_fail_no_mem:
+        printk(KERN_WARNING "GDROM: Probe failed - error is 0x%X\n", err);
+        return err;
+}
+
+static int __devexit remove_gdrom(struct platform_device *devptr)
+{
+        flush_scheduled_work();
+        blk_cleanup_queue(gd.gdrom_rq);
+        free_irq(HW_EVENT_GDROM_CMD, &gd);
+        free_irq(HW_EVENT_GDROM_DMA, &gd);
+        del_gendisk(gd.disk);
+        if (gdrom_major)
+                unregister_blkdev(gdrom_major, GDROM_DEV_NAME);
+        return unregister_cdrom(gd.cd_info);
+}
+
+static struct platform_driver gdrom_driver = {
+        .probe = probe_gdrom,
+        .remove = __devexit_p(remove_gdrom),
+        .driver = {
+                        .name = GDROM_DEV_NAME,
+        },
+};
+
+static int __init init_gdrom(void)
+{
+        int rc;
+        gd.toc = NULL;
+        rc = platform_driver_register(&gdrom_driver);
+        if (rc)
+                return rc;
+        pd = platform_device_register_simple(GDROM_DEV_NAME, -1, NULL, 0);
+        if (IS_ERR(pd)) {
+                platform_driver_unregister(&gdrom_driver);
+                return PTR_ERR(pd);
+        }
+        return 0;
+}
+
+static void __exit exit_gdrom(void)
+{
+        platform_device_unregister(pd);
+        platform_driver_unregister(&gdrom_driver);
+        kfree(gd.toc);
+}
+
+module_init(init_gdrom);
+module_exit(exit_gdrom);
+MODULE_AUTHOR("Adrian McMenamin <adrian@mcmen.demon.co.uk>");
+MODULE_DESCRIPTION("SEGA Dreamcast GD-ROM Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 1e6715ec51ef..45e4b9648176 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -404,7 +404,7 @@ config RTC_DRV_SA1100
 
 config RTC_DRV_SH
         tristate "SuperH On-Chip RTC"
-        depends on RTC_CLASS && (CPU_SH3 || CPU_SH4)
+        depends on RTC_CLASS && SUPERH
         help
           Say Y here to enable support for the on-chip RTC found in
           most SuperH processors.
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 8e8c8b8e81ee..c1d6a1880ccf 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -26,17 +26,7 @@
 #include <asm/rtc.h>
 
 #define DRV_NAME        "sh-rtc"
-#define DRV_VERSION     "0.1.3"
-
-#ifdef CONFIG_CPU_SH3
-#define rtc_reg_size            sizeof(u16)
-#define RTC_BIT_INVERTED        0       /* No bug on SH7708, SH7709A */
-#define RTC_DEF_CAPABILITIES    0UL
-#elif defined(CONFIG_CPU_SH4)
-#define rtc_reg_size            sizeof(u32)
-#define RTC_BIT_INVERTED        0x40    /* bug on SH7750, SH7750S */
-#define RTC_DEF_CAPABILITIES    RTC_CAP_4_DIGIT_YEAR
-#endif
+#define DRV_VERSION     "0.1.6"
 
 #define RTC_REG(r)      ((r) * rtc_reg_size)
 
@@ -58,6 +48,18 @@
 #define RCR1            RTC_REG(14)     /* Control */
 #define RCR2            RTC_REG(15)     /* Control */
 
+/*
+ * Note on RYRAR and RCR3: Up until this point most of the register
+ * definitions are consistent across all of the available parts. However,
+ * the placement of the optional RYRAR and RCR3 (the RYRAR control
+ * register used to control RYRCNT/RYRAR compare) varies considerably
+ * across various parts, occasionally being mapped in to a completely
+ * unrelated address space. For proper RYRAR support a separate resource
+ * would have to be handed off, but as this is purely optional in
+ * practice, we simply opt not to support it, thereby keeping the code
+ * quite a bit more simplified.
+ */
+
 /* ALARM Bits - or with BCD encoded value */
 #define AR_ENB          0x80    /* Enable for alarm cmp   */
 
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 73440e26834b..ddf639144538 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -302,7 +302,7 @@ static void sci_init_pins_scif(struct uart_port* port, unsigned int cflag)
         }
         sci_out(port, SCFCR, fcr_val);
 }
-#elif defined(CONFIG_CPU_SUBTYPE_SH7720)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7720) || defined(CONFIG_CPU_SUBTYPE_SH7721)
 static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
 {
         unsigned int fcr_val = 0;
@@ -395,7 +395,8 @@ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
         } else {
 #ifdef CONFIG_CPU_SUBTYPE_SH7343
                 /* Nothing */
-#elif defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+#elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7780) || \
       defined(CONFIG_CPU_SUBTYPE_SH7785) || \
       defined(CONFIG_CPU_SUBTYPE_SHX3)
                 ctrl_outw(0x0080, SCSPTR0); /* Set RTS = 1 */
@@ -408,6 +409,7 @@ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
 #endif
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7760) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7763) || \
     defined(CONFIG_CPU_SUBTYPE_SH7780) || \
     defined(CONFIG_CPU_SUBTYPE_SH7785)
 static inline int scif_txroom(struct uart_port *port)
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index d24621ce799a..f5764ebcfe07 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -46,7 +46,8 @@
  */
 # define SCSCR_INIT(port) (port->mapbase == SCIF2) ? 0xF3 : 0xF0
 # define SCIF_ONLY
-#elif defined(CONFIG_CPU_SUBTYPE_SH7720)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7721)
 # define SCSCR_INIT(port)  0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */
 # define SCIF_ONLY
 #define SCIF_ORER    0x0200   /* overrun error bit */
@@ -119,6 +120,12 @@
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
 # define SCI_ONLY
 # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7763)
+# define SCSPTR0 0xffe00024 /* 16 bit SCIF */
+# define SCSPTR1 0xffe08024 /* 16 bit SCIF */
+# define SCIF_ORER 0x0001  /* overrun error bit */
+# define SCSCR_INIT(port)       0x3a    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
+# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7770)
 # define SCSPTR0 0xff923020 /* 16 bit SCIF */
 # define SCSPTR1 0xff924020 /* 16 bit SCIF */
@@ -142,7 +149,9 @@
 # define SCIF_OPER      0x0001          /* Overrun error bit */
 # define SCSCR_INIT(port)       0x3a    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
 # define SCIF_ONLY
-#elif defined(CONFIG_CPU_SUBTYPE_SH7206)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7203) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7206) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7263)
 # define SCSPTR0 0xfffe8020 /* 16 bit SCIF */
 # define SCSPTR1 0xfffe8820 /* 16 bit SCIF */
 # define SCSPTR2 0xfffe9020 /* 16 bit SCIF */
@@ -214,7 +223,8 @@
 #define SCIF_DR    0x0001 /* 7705 SCIF, 7707 SCIF, 7709 SCIF, 7750 SCIF */
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7720)
+    defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)
 #define SCIF_ORER    0x0200
 #define SCIF_ERRORS ( SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK | SCIF_ORER)
 #define SCIF_RFDC_MASK 0x007f
@@ -252,7 +262,8 @@
 # define SCxSR_PER(port)                SCIF_PER
 # define SCxSR_BRK(port)                SCIF_BRK
 #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7720)
+    defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)
 # define SCxSR_RDxF_CLEAR(port)         (sci_in(port,SCxSR)&0xfffc)
 # define SCxSR_ERROR_CLEAR(port)        (sci_in(port,SCxSR)&0xfd73)
 # define SCxSR_TDxE_CLEAR(port)         (sci_in(port,SCxSR)&0xffdf)
@@ -361,7 +372,8 @@
 #define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) \
           CPU_SCIF_FNS(name, sh4_scif_offset, sh4_scif_size)
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7720)
+      defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7721)
 #define SCIF_FNS(name, scif_offset, scif_size) \
   CPU_SCIF_FNS(name, scif_offset, scif_size)
 #else
@@ -388,7 +400,8 @@
 #endif
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7720)
+    defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)
 
 SCIF_FNS(SCSMR,  0x00, 16)
 SCIF_FNS(SCBRR,  0x04,  8)
@@ -412,6 +425,7 @@ SCIx_FNS(SCxSR,  0x08,  8, 0x10,  8, 0x08, 16, 0x10, 16, 0x04,  8)
 SCIx_FNS(SCxRDR, 0x0a,  8, 0x14,  8, 0x0A,  8, 0x14,  8, 0x05,  8)
 SCIF_FNS(SCFCR,                      0x0c,  8, 0x18, 16)
 #if defined(CONFIG_CPU_SUBTYPE_SH7760) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7763) || \
     defined(CONFIG_CPU_SUBTYPE_SH7780) || \
     defined(CONFIG_CPU_SUBTYPE_SH7785)
 SCIF_FNS(SCFDR,                      0x0e, 16, 0x1C, 16)
@@ -510,7 +524,8 @@ static inline void set_sh771x_scif_pfc(struct uart_port *port)
                 return;
         }
 }
-#elif defined(CONFIG_CPU_SUBTYPE_SH7720)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7721)
 static inline int sci_rxd_in(struct uart_port *port)
 {
         if (port->mapbase == 0xa4430000)
@@ -580,6 +595,15 @@ static inline int sci_rxd_in(struct uart_port *port)
         int ch = (port->mapbase - SMR0) >> 3;
         return (H8300_SCI_DR(ch) & h8300_sci_pins[ch].rx) ? 1 : 0;
 }
+#elif defined(CONFIG_CPU_SUBTYPE_SH7763)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xffe00000)
+                return ctrl_inw(SCSPTR0) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xffe08000)
+                return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0; /* SCIF */
+        return 1;
+}
 #elif defined(CONFIG_CPU_SUBTYPE_SH7770)
 static inline int sci_rxd_in(struct uart_port *port)
 {
@@ -617,7 +641,9 @@ static inline int sci_rxd_in(struct uart_port *port)
                 return ctrl_inw(SCSPTR5) & 0x0001 ? 1 : 0; /* SCIF */
         return 1;
 }
-#elif defined(CONFIG_CPU_SUBTYPE_SH7206)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7203) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7206) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7263)
 static inline int sci_rxd_in(struct uart_port *port)
 {
         if (port->mapbase == 0xfffe8000)
@@ -688,11 +714,13 @@ static inline int sci_rxd_in(struct uart_port *port)
  * -- Mitch Davis - 15 Jul 2000
  */
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+#if defined(CONFIG_CPU_SUBTYPE_SH7763) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7780) || \
     defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(16*bps)-1)
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7720)
+      defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7721)
 #define SCBRR_VALUE(bps, clk) (((clk*2)+16*bps)/(32*bps)-1)
 #elif defined(__H8300H__) || defined(__H8300S__)
 #define SCBRR_VALUE(bps) (((CONFIG_CPU_CLOCK*1000/32)/bps)-1)
diff --git a/include/asm-sh/Kbuild b/include/asm-sh/Kbuild
index 76a8ccf254a5..43910cdf78a5 100644
--- a/include/asm-sh/Kbuild
+++ b/include/asm-sh/Kbuild
@@ -1,3 +1,8 @@
 include include/asm-generic/Kbuild.asm
 
 header-y += cpu-features.h
+
+unifdef-y += unistd_32.h
+unifdef-y += unistd_64.h
+unifdef-y += posix_types_32.h
+unifdef-y += posix_types_64.h
diff --git a/include/asm-sh/addrspace.h b/include/asm-sh/addrspace.h
index b860218e402e..fa544fc38c23 100644
--- a/include/asm-sh/addrspace.h
+++ b/include/asm-sh/addrspace.h
@@ -9,24 +9,21 @@
  */
 #ifndef __ASM_SH_ADDRSPACE_H
 #define __ASM_SH_ADDRSPACE_H
+
 #ifdef __KERNEL__
 
 #include <asm/cpu/addrspace.h>
 
-/* Memory segments (32bit Privileged mode addresses)  */
-#ifndef CONFIG_CPU_SH2A
-#define P0SEG           0x00000000
-#define P1SEG           0x80000000
-#define P2SEG           0xa0000000
-#define P3SEG           0xc0000000
-#define P4SEG           0xe0000000
-#else
-#define P0SEG           0x00000000
-#define P1SEG           0x00000000
-#define P2SEG           0x20000000
-#define P3SEG           0x00000000
-#define P4SEG           0x80000000
-#endif
+/* If this CPU supports segmentation, hook up the helpers */
+#ifdef P1SEG
+
+/*
+   [ P0/U0 (virtual) ]          0x00000000     <------ User space
+   [ P1 (fixed)   cached ]      0x80000000     <------ Kernel space
+   [ P2 (fixed)  non-cachable]  0xA0000000     <------ Physical access
+   [ P3 (virtual) cached]       0xC0000000     <------ vmalloced area
+   [ P4 control   ]             0xE0000000
+ */
 
 /* Returns the privileged segment base of a given address  */
 #define PXSEG(a)        (((unsigned long)(a)) & 0xe0000000)
@@ -34,13 +31,23 @@
 /* Returns the physical address of a PnSEG (n=1,2) address   */
 #define PHYSADDR(a)     (((unsigned long)(a)) & 0x1fffffff)
 
+#ifdef CONFIG_29BIT
 /*
  * Map an address to a certain privileged segment
  */
-#define P1SEGADDR(a)    ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | P1SEG))
-#define P2SEGADDR(a)    ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | P2SEG))
-#define P3SEGADDR(a)    ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | P3SEG))
-#define P4SEGADDR(a)    ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | P4SEG))
+#define P1SEGADDR(a)    \
+        ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | P1SEG))
+#define P2SEGADDR(a)    \
+        ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | P2SEG))
+#define P3SEGADDR(a)    \
+        ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | P3SEG))
+#define P4SEGADDR(a)    \
+        ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | P4SEG))
+#endif /* 29BIT */
+#endif /* P1SEG */
+
+/* Check if an address can be reached in 29 bits */
+#define IS_29BIT(a)     (((unsigned long)(a)) < 0x20000000)
 
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_ADDRSPACE_H */
diff --git a/include/asm-sh/atomic-grb.h b/include/asm-sh/atomic-grb.h
new file mode 100644
index 000000000000..4c5b7dbfcedb
--- /dev/null
+++ b/include/asm-sh/atomic-grb.h
@@ -0,0 +1,169 @@
+#ifndef __ASM_SH_ATOMIC_GRB_H
+#define __ASM_SH_ATOMIC_GRB_H
+
+static inline void atomic_add(int i, atomic_t *v)
+{
+        int tmp;
+
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov    #-6,   r15     \n\t" /* LOGIN: r15 = size */
+                "   mov.l  @%1,   %0      \n\t" /* load  old value */
+                "   add     %2,   %0      \n\t" /* add */
+                "   mov.l   %0,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "+r"  (v)
+                : "r"   (i)
+                : "memory" , "r0", "r1");
+}
+
+static inline void atomic_sub(int i, atomic_t *v)
+{
+        int tmp;
+
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov     r15,  r1      \n\t" /* r1 = saved sp */
+                "   mov    #-6,   r15     \n\t" /* LOGIN: r15 = size */
+                "   mov.l  @%1,   %0      \n\t" /* load  old value */
+                "   sub     %2,   %0      \n\t" /* sub */
+                "   mov.l   %0,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "+r"  (v)
+                : "r"   (i)
+                : "memory" , "r0", "r1");
+}
+
+static inline int atomic_add_return(int i, atomic_t *v)
+{
+        int tmp;
+
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov    #-6,   r15     \n\t" /* LOGIN: r15 = size */
+                "   mov.l  @%1,   %0      \n\t" /* load  old value */
+                "   add     %2,   %0      \n\t" /* add */
+                "   mov.l   %0,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "+r"  (v)
+                : "r"   (i)
+                : "memory" , "r0", "r1");
+
+        return tmp;
+}
+
+static inline int atomic_sub_return(int i, atomic_t *v)
+{
+        int tmp;
+
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov    #-6,   r15     \n\t" /* LOGIN: r15 = size */
+                "   mov.l  @%1,   %0      \n\t" /* load  old value */
+                "   sub     %2,   %0      \n\t" /* sub */
+                "   mov.l   %0,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "+r"  (v)
+                : "r"   (i)
+                : "memory", "r0", "r1");
+
+        return tmp;
+}
+
+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
+{
+        int tmp;
+        unsigned int _mask = ~mask;
+
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov    #-6,   r15     \n\t" /* LOGIN: r15 = size */
+                "   mov.l  @%1,   %0      \n\t" /* load  old value */
+                "   and     %2,   %0      \n\t" /* add */
+                "   mov.l   %0,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "+r"  (v)
+                : "r"   (_mask)
+                : "memory" , "r0", "r1");
+}
+
+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
+{
+        int tmp;
+
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov    #-6,   r15     \n\t" /* LOGIN: r15 = size */
+                "   mov.l  @%1,   %0      \n\t" /* load  old value */
+                "   or      %2,   %0      \n\t" /* or */
+                "   mov.l   %0,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "+r"  (v)
+                : "r"   (mask)
+                : "memory" , "r0", "r1");
+}
+
+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
+{
+        int ret;
+
+        __asm__ __volatile__ (
+                "   .align 2            \n\t"
+                "   mova     1f,  r0    \n\t"
+                "   nop                 \n\t"
+                "   mov     r15,  r1    \n\t"
+                "   mov    #-8,  r15    \n\t"
+                "   mov.l   @%1,  %0    \n\t"
+                "   cmp/eq   %2,  %0    \n\t"
+                "   bf       1f         \n\t"
+                "   mov.l    %3, @%1    \n\t"
+                "1: mov      r1,  r15   \n\t"
+                : "=&r" (ret)
+                : "r" (v), "r" (old), "r" (new)
+                : "memory" , "r0", "r1" , "t");
+
+        return ret;
+}
+
+static inline int atomic_add_unless(atomic_t *v, int a, int u)
+{
+        int ret;
+        unsigned long tmp;
+
+        __asm__ __volatile__ (
+                "   .align 2            \n\t"
+                "   mova    1f,   r0    \n\t"
+                "   nop                 \n\t"
+                "   mov    r15,   r1    \n\t"
+                "   mov    #-12,  r15   \n\t"
+                "   mov.l  @%2,   %1    \n\t"
+                "   mov     %1,   %0    \n\t"
+                "   cmp/eq  %4,   %0    \n\t"
+                "   bt/s    1f          \n\t"
+                "    add    %3,   %1    \n\t"
+                "   mov.l   %1,  @%2    \n\t"
+                "1: mov     r1,   r15   \n\t"
+                : "=&r" (ret), "=&r" (tmp)
+                : "r" (v), "r" (a), "r" (u)
+                : "memory" , "r0", "r1" , "t");
+
+        return ret != u;
+}
+#endif /* __ASM_SH_ATOMIC_GRB_H */
diff --git a/include/asm-sh/atomic.h b/include/asm-sh/atomic.h
index e12570b9339d..c043ef003028 100644
--- a/include/asm-sh/atomic.h
+++ b/include/asm-sh/atomic.h
@@ -17,7 +17,9 @@ typedef struct { volatile int counter; } atomic_t;
 #include <linux/compiler.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_CPU_SH4A
+#if defined(CONFIG_GUSA_RB)
+#include <asm/atomic-grb.h>
+#elif defined(CONFIG_CPU_SH4A)
 #include <asm/atomic-llsc.h>
 #else
 #include <asm/atomic-irq.h>
@@ -44,6 +46,7 @@ typedef struct { volatile int counter; } atomic_t;
 #define atomic_inc(v) atomic_add(1,(v))
 #define atomic_dec(v) atomic_sub(1,(v))
 
+#ifndef CONFIG_GUSA_RB
 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
 {
         int ret;
@@ -58,8 +61,6 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
         return ret;
 }
 
-#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
-
 static inline int atomic_add_unless(atomic_t *v, int a, int u)
 {
         int ret;
@@ -73,6 +74,9 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 
         return ret != u;
 }
+#endif
+
+#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
 
 /* Atomic operations are already serializing on SH */
diff --git a/include/asm-sh/auxvec.h b/include/asm-sh/auxvec.h
index 1b6916e63e90..a6b9d4f4859e 100644
--- a/include/asm-sh/auxvec.h
+++ b/include/asm-sh/auxvec.h
@@ -6,6 +6,12 @@
  * for more of them.
  */
 
+/*
+ * This entry gives some information about the FPU initialization
+ * performed by the kernel.
+ */
+#define AT_FPUCW                18      /* Used FPU control word.  */
+
 #ifdef CONFIG_VSYSCALL
 /*
  * Only define this in the vsyscall case, the entry point to
@@ -15,4 +21,16 @@
 #define AT_SYSINFO_EHDR         33
 #endif
 
+/*
+ * More complete cache descriptions than AT_[DIU]CACHEBSIZE.  If the
+ * value is -1, then the cache doesn't exist.  Otherwise:
+ *
+ *    bit 0-3:    Cache set-associativity; 0 means fully associative.
+ *    bit 4-7:    Log2 of cacheline size.
+ *    bit 8-31:   Size of the entire cache >> 8.
+ */
+#define AT_L1I_CACHESHAPE       34
+#define AT_L1D_CACHESHAPE       35
+#define AT_L2_CACHESHAPE        36
+
 #endif /* __ASM_SH_AUXVEC_H */
diff --git a/include/asm-sh/bitops-grb.h b/include/asm-sh/bitops-grb.h
new file mode 100644
index 000000000000..a5907b94395b
--- /dev/null
+++ b/include/asm-sh/bitops-grb.h
@@ -0,0 +1,169 @@
+#ifndef __ASM_SH_BITOPS_GRB_H
+#define __ASM_SH_BITOPS_GRB_H
+
+static inline void set_bit(int nr, volatile void * addr)
+{
+        int     mask;
+        volatile unsigned int *a = addr;
+        unsigned long tmp;
+
+        a += nr >> 5;
+        mask = 1 << (nr & 0x1f);
+
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov    #-6,   r15     \n\t" /* LOGIN: r15 = size */
+                "   mov.l  @%1,   %0      \n\t" /* load  old value */
+                "   or      %2,   %0      \n\t" /* or */
+                "   mov.l   %0,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "+r"  (a)
+                : "r"   (mask)
+                : "memory" , "r0", "r1");
+}
+
+static inline void clear_bit(int nr, volatile void * addr)
+{
+        int     mask;
+        volatile unsigned int *a = addr;
+        unsigned long tmp;
+
+        a += nr >> 5;
+        mask = ~(1 << (nr & 0x1f));
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov    #-6,   r15     \n\t" /* LOGIN: r15 = size */
+                "   mov.l  @%1,   %0      \n\t" /* load  old value */
+                "   and     %2,   %0      \n\t" /* and */
+                "   mov.l   %0,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "+r"  (a)
+                : "r"   (mask)
+                : "memory" , "r0", "r1");
+}
+
+static inline void change_bit(int nr, volatile void * addr)
+{
+        int     mask;
+        volatile unsigned int *a = addr;
+        unsigned long tmp;
+
+        a += nr >> 5;
+        mask = 1 << (nr & 0x1f);
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov    #-6,   r15     \n\t" /* LOGIN: r15 = size */
+                "   mov.l  @%1,   %0      \n\t" /* load  old value */
+                "   xor     %2,   %0      \n\t" /* xor */
+                "   mov.l   %0,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "+r"  (a)
+                : "r"   (mask)
+                : "memory" , "r0", "r1");
+}
+
+static inline int test_and_set_bit(int nr, volatile void * addr)
+{
+        int     mask, retval;
+        volatile unsigned int *a = addr;
+        unsigned long tmp;
+
+        a += nr >> 5;
+        mask = 1 << (nr & 0x1f);
+
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov   #-14,   r15     \n\t" /* LOGIN: r15 = size */
+                "   mov.l  @%2,   %0      \n\t" /* load old value */
+                "   mov     %0,   %1      \n\t"
+                "   tst     %1,   %3      \n\t" /* T = ((*a & mask) == 0) */
+                "   mov    #-1,   %1      \n\t" /* retvat = -1 */
+                "   negc    %1,   %1      \n\t" /* retval = (mask & *a) != 0 */
+                "   or      %3,   %0      \n\t"
+                "   mov.l   %0,  @%2      \n\t" /* store new value */
+                "1: mov     r1,  r15      \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "=&r" (retval),
+                  "+r"  (a)
+                : "r"   (mask)
+                : "memory" , "r0", "r1" ,"t");
+
+        return retval;
+}
+
+static inline int test_and_clear_bit(int nr, volatile void * addr)
+{
+        int     mask, retval,not_mask;
+        volatile unsigned int *a = addr;
+        unsigned long tmp;
+
+        a += nr >> 5;
+        mask = 1 << (nr & 0x1f);
+
+        not_mask = ~mask;
+
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov   #-14,   r15     \n\t" /* LOGIN */
+                "   mov.l  @%2,   %0      \n\t" /* load old value */
+                "   mov     %0,   %1      \n\t" /* %1 = *a */
+                "   tst     %1,   %3      \n\t" /* T = ((*a & mask) == 0) */
+                "   mov    #-1,   %1      \n\t" /* retvat = -1 */
+                "   negc    %1,   %1      \n\t" /* retval = (mask & *a) != 0 */
+                "   and     %4,   %0      \n\t"
+                "   mov.l   %0,  @%2      \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "=&r" (retval),
+                  "+r"  (a)
+                : "r"   (mask),
+                  "r"   (not_mask)
+                : "memory" , "r0", "r1", "t");
+
+        return retval;
+}
+
+static inline int test_and_change_bit(int nr, volatile void * addr)
+{
+        int     mask, retval;
+        volatile unsigned int *a = addr;
+        unsigned long tmp;
+
+        a += nr >> 5;
+        mask = 1 << (nr & 0x1f);
+
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov   #-14,   r15     \n\t" /* LOGIN */
+                "   mov.l  @%2,   %0      \n\t" /* load old value */
+                "   mov     %0,   %1      \n\t" /* %1 = *a */
+                "   tst     %1,   %3      \n\t" /* T = ((*a & mask) == 0) */
+                "   mov    #-1,   %1      \n\t" /* retvat = -1 */
+                "   negc    %1,   %1      \n\t" /* retval = (mask & *a) != 0 */
+                "   xor     %3,   %0      \n\t"
+                "   mov.l   %0,  @%2      \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (tmp),
+                  "=&r" (retval),
+                  "+r"  (a)
+                : "r"   (mask)
+                : "memory" , "r0", "r1", "t");
+
+        return retval;
+}
+#endif /* __ASM_SH_BITOPS_GRB_H */
diff --git a/include/asm-sh/bitops-irq.h b/include/asm-sh/bitops-irq.h
new file mode 100644
index 000000000000..653a12750584
--- /dev/null
+++ b/include/asm-sh/bitops-irq.h
@@ -0,0 +1,91 @@
+#ifndef __ASM_SH_BITOPS_IRQ_H
+#define __ASM_SH_BITOPS_IRQ_H
+
+static inline void set_bit(int nr, volatile void *addr)
+{
+        int     mask;
+        volatile unsigned int *a = addr;
+        unsigned long flags;
+
+        a += nr >> 5;
+        mask = 1 << (nr & 0x1f);
+        local_irq_save(flags);
+        *a |= mask;
+        local_irq_restore(flags);
+}
+
+static inline void clear_bit(int nr, volatile void *addr)
+{
+        int     mask;
+        volatile unsigned int *a = addr;
+        unsigned long flags;
+
+        a += nr >> 5;
+        mask = 1 << (nr & 0x1f);
+        local_irq_save(flags);
+        *a &= ~mask;
+        local_irq_restore(flags);
+}
+
+static inline void change_bit(int nr, volatile void *addr)
+{
+        int     mask;
+        volatile unsigned int *a = addr;
+        unsigned long flags;
+
+        a += nr >> 5;
+        mask = 1 << (nr & 0x1f);
+        local_irq_save(flags);
+        *a ^= mask;
+        local_irq_restore(flags);
+}
+
+static inline int test_and_set_bit(int nr, volatile void *addr)
+{
+        int     mask, retval;
+        volatile unsigned int *a = addr;
+        unsigned long flags;
+
+        a += nr >> 5;
+        mask = 1 << (nr & 0x1f);
+        local_irq_save(flags);
+        retval = (mask & *a) != 0;
+        *a |= mask;
+        local_irq_restore(flags);
+
+        return retval;
+}
+
+static inline int test_and_clear_bit(int nr, volatile void *addr)
+{
+        int     mask, retval;
+        volatile unsigned int *a = addr;
+        unsigned long flags;
+
+        a += nr >> 5;
+        mask = 1 << (nr & 0x1f);
+        local_irq_save(flags);
+        retval = (mask & *a) != 0;
+        *a &= ~mask;
+        local_irq_restore(flags);
+
+        return retval;
+}
+
+static inline int test_and_change_bit(int nr, volatile void *addr)
+{
+        int     mask, retval;
+        volatile unsigned int *a = addr;
+        unsigned long flags;
+
+        a += nr >> 5;
+        mask = 1 << (nr & 0x1f);
+        local_irq_save(flags);
+        retval = (mask & *a) != 0;
+        *a ^= mask;
+        local_irq_restore(flags);
+
+        return retval;
+}
+
+#endif /* __ASM_SH_BITOPS_IRQ_H */
diff --git a/include/asm-sh/bitops.h b/include/asm-sh/bitops.h
index df805f20b267..b6ba5a60dec2 100644
--- a/include/asm-sh/bitops.h
+++ b/include/asm-sh/bitops.h
@@ -11,100 +11,22 @@
 /* For __swab32 */
 #include <asm/byteorder.h>
 
-static inline void set_bit(int nr, volatile void * addr)
-{
-        int     mask;
-        volatile unsigned int *a = addr;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        *a |= mask;
-        local_irq_restore(flags);
-}
+#ifdef CONFIG_GUSA_RB
+#include <asm/bitops-grb.h>
+#else
+#include <asm/bitops-irq.h>
+#endif
+
 
 /*
  * clear_bit() doesn't provide any barrier for the compiler.
  */
 #define smp_mb__before_clear_bit()      barrier()
 #define smp_mb__after_clear_bit()       barrier()
-static inline void clear_bit(int nr, volatile void * addr)
-{
-        int     mask;
-        volatile unsigned int *a = addr;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        *a &= ~mask;
-        local_irq_restore(flags);
-}
-
-static inline void change_bit(int nr, volatile void * addr)
-{
-        int     mask;
-        volatile unsigned int *a = addr;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        *a ^= mask;
-        local_irq_restore(flags);
-}
-
-static inline int test_and_set_bit(int nr, volatile void * addr)
-{
-        int     mask, retval;
-        volatile unsigned int *a = addr;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        retval = (mask & *a) != 0;
-        *a |= mask;
-        local_irq_restore(flags);
-
-        return retval;
-}
-
-static inline int test_and_clear_bit(int nr, volatile void * addr)
-{
-        int     mask, retval;
-        volatile unsigned int *a = addr;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        retval = (mask & *a) != 0;
-        *a &= ~mask;
-        local_irq_restore(flags);
-
-        return retval;
-}
-
-static inline int test_and_change_bit(int nr, volatile void * addr)
-{
-        int     mask, retval;
-        volatile unsigned int *a = addr;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        retval = (mask & *a) != 0;
-        *a ^= mask;
-        local_irq_restore(flags);
-
-        return retval;
-}
 
 #include <asm-generic/bitops/non-atomic.h>
 
+#ifdef CONFIG_SUPERH32
 static inline unsigned long ffz(unsigned long word)
 {
         unsigned long result;
@@ -138,6 +60,31 @@ static inline unsigned long __ffs(unsigned long word)
                 : "t");
         return result;
 }
+#else
+static inline unsigned long ffz(unsigned long word)
+{
+        unsigned long result, __d2, __d3;
+
+        __asm__("gettr  tr0, %2\n\t"
+                "pta    $+32, tr0\n\t"
+                "andi   %1, 1, %3\n\t"
+                "beq    %3, r63, tr0\n\t"
+                "pta    $+4, tr0\n"
+                "0:\n\t"
+                "shlri.l        %1, 1, %1\n\t"
+                "addi   %0, 1, %0\n\t"
+                "andi   %1, 1, %3\n\t"
+                "beqi   %3, 1, tr0\n"
+                "1:\n\t"
+                "ptabs  %2, tr0\n\t"
+                : "=r" (result), "=r" (word), "=r" (__d2), "=r" (__d3)
+                : "0" (0L), "1" (word));
+
+        return result;
+}
+
+#include <asm-generic/bitops/__ffs.h>
+#endif
 
 #include <asm-generic/bitops/find.h>
 #include <asm-generic/bitops/ffs.h>
diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h
index a78d482e8b2f..c01718040166 100644
--- a/include/asm-sh/bug.h
+++ b/include/asm-sh/bug.h
@@ -3,7 +3,7 @@
 
 #define TRAPA_BUG_OPCODE        0xc33e  /* trapa #0x3e */
 
-#ifdef CONFIG_BUG
+#ifdef CONFIG_GENERIC_BUG
 #define HAVE_ARCH_BUG
 #define HAVE_ARCH_WARN_ON
 
@@ -72,12 +72,7 @@ do {							\
         unlikely(__ret_warn_on);                                \
 })
 
-struct pt_regs;
-
-/* arch/sh/kernel/traps.c */
-void handle_BUG(struct pt_regs *);
-
-#endif /* CONFIG_BUG */
+#endif /* CONFIG_GENERIC_BUG */
 
 #include <asm-generic/bug.h>
 
diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h
index b66139ff73fc..def8128b8b78 100644
--- a/include/asm-sh/bugs.h
+++ b/include/asm-sh/bugs.h
@@ -25,7 +25,7 @@ static void __init check_bugs(void)
         case CPU_SH7619:
                 *p++ = '2';
                 break;
-        case CPU_SH7206:
+        case CPU_SH7203 ... CPU_SH7263:
                 *p++ = '2';
                 *p++ = 'a';
                 break;
@@ -35,7 +35,7 @@ static void __init check_bugs(void)
         case CPU_SH7750 ... CPU_SH4_501:
                 *p++ = '4';
                 break;
-        case CPU_SH7770 ... CPU_SHX3:
+        case CPU_SH7763 ... CPU_SHX3:
                 *p++ = '4';
                 *p++ = 'a';
                 break;
@@ -48,9 +48,16 @@ static void __init check_bugs(void)
                 *p++ = 's';
                 *p++ = 'p';
                 break;
-        default:
-                *p++ = '?';
-                *p++ = '!';
+        case CPU_SH5_101 ... CPU_SH5_103:
+                *p++ = '6';
+                *p++ = '4';
+                break;
+        case CPU_SH_NONE:
+                /*
+                 * Specifically use CPU_SH_NONE rather than default:,
+                 * so we're able to have the compiler whine about
+                 * unhandled enumerations.
+                 */
                 break;
         }
 
diff --git a/include/asm-sh/byteorder.h b/include/asm-sh/byteorder.h
index bff2b1382e01..0eb9904b6545 100644
--- a/include/asm-sh/byteorder.h
+++ b/include/asm-sh/byteorder.h
@@ -3,40 +3,55 @@
 
 /*
  * Copyright (C) 1999  Niibe Yutaka
+ * Copyright (C) 2000, 2001  Paolo Alberelli
  */
-
-#include <asm/types.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
 {
-        __asm__("swap.b %0, %0\n\t"
-                "swap.w %0, %0\n\t"
-                "swap.b %0, %0"
+        __asm__(
+#ifdef CONFIG_SUPERH32
+                "swap.b         %0, %0\n\t"
+                "swap.w         %0, %0\n\t"
+                "swap.b         %0, %0"
+#else
+                "byterev        %0, %0\n\t"
+                "shari          %0, 32, %0"
+#endif
                 : "=r" (x)
                 : "0" (x));
+
         return x;
 }
 
-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+static inline __attribute_const__ __u16 ___arch__swab16(__u16 x)
 {
-        __asm__("swap.b %0, %0"
+        __asm__(
+#ifdef CONFIG_SUPERH32
+                "swap.b         %0, %0"
+#else
+                "byterev        %0, %0\n\t"
+                "shari          %0, 32, %0"
+
+#endif
                 : "=r" (x)
                 :  "0" (x));
+
         return x;
 }
 
-static inline __u64 ___arch__swab64(__u64 val) 
-{ 
-        union { 
+static inline __u64 ___arch__swab64(__u64 val)
+{
+        union {
                 struct { __u32 a,b; } s;
                 __u64 u;
         } v, w;
         v.u = val;
-        w.s.b = ___arch__swab32(v.s.a); 
-        w.s.a = ___arch__swab32(v.s.b); 
-        return w.u;     
-} 
+        w.s.b = ___arch__swab32(v.s.a);
+        w.s.a = ___arch__swab32(v.s.b);
+        return w.u;
+}
 
 #define __arch__swab64(x) ___arch__swab64(x)
 #define __arch__swab32(x) ___arch__swab32(x)
diff --git a/include/asm-sh/cache.h b/include/asm-sh/cache.h
index 01e5cf51ba9b..083419f47c65 100644
--- a/include/asm-sh/cache.h
+++ b/include/asm-sh/cache.h
@@ -12,11 +12,6 @@
 #include <linux/init.h>
 #include <asm/cpu/cache.h>
 
-#define SH_CACHE_VALID          1
-#define SH_CACHE_UPDATED        2
-#define SH_CACHE_COMBINED       4
-#define SH_CACHE_ASSOC          8
-
 #define L1_CACHE_BYTES          (1 << L1_CACHE_SHIFT)
 
 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
diff --git a/include/asm-sh/checksum.h b/include/asm-sh/checksum.h
index 4bc8357e8892..67496ab0ef04 100644
--- a/include/asm-sh/checksum.h
+++ b/include/asm-sh/checksum.h
@@ -1,215 +1,5 @@
-#ifndef __ASM_SH_CHECKSUM_H
-#define __ASM_SH_CHECKSUM_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1999 by Kaz Kojima & Niibe Yutaka
- */
-
-#include <linux/in6.h>
-
-/*
- * computes the checksum of a memory block at buff, length len,
- * and adds in "sum" (32-bit)
- *
- * returns a 32-bit number suitable for feeding into itself
- * or csum_tcpudp_magic
- *
- * this function must be called with even lengths, except
- * for the last fragment, which may be odd
- *
- * it's best to have buff aligned on a 32-bit boundary
- */
-asmlinkage __wsum csum_partial(const void *buff, int len, __wsum sum);
-
-/*
- * the same as csum_partial, but copies from src while it
- * checksums, and handles user-space pointer exceptions correctly, when needed.
- *
- * here even more important to align src and dst on a 32-bit (or even
- * better 64-bit) boundary
- */
-
-asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
-                                            int len, __wsum sum,
-                                            int *src_err_ptr, int *dst_err_ptr);
-
-/*
- *      Note: when you get a NULL pointer exception here this means someone
- *      passed in an incorrect kernel address to one of these functions.
- *
- *      If you use these functions directly please don't forget the
- *      access_ok().
- */
-static inline
-__wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                 int len, __wsum sum)
-{
-        return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);
-}
-
-static inline
-__wsum csum_partial_copy_from_user(const void __user *src, void *dst,
-                                   int len, __wsum sum, int *err_ptr)
-{
-        return csum_partial_copy_generic((__force const void *)src, dst,
-                                        len, sum, err_ptr, NULL);
-}
-
-/*
- *      Fold a partial checksum
- */
-
-static inline __sum16 csum_fold(__wsum sum)
-{
-        unsigned int __dummy;
-        __asm__("swap.w %0, %1\n\t"
-                "extu.w %0, %0\n\t"
-                "extu.w %1, %1\n\t"
-                "add    %1, %0\n\t"
-                "swap.w %0, %1\n\t"
-                "add    %1, %0\n\t"
-                "not    %0, %0\n\t"
-                : "=r" (sum), "=&r" (__dummy)
-                : "0" (sum)
-                : "t");
-        return (__force __sum16)sum;
-}
-
-/*
- *      This is a version of ip_compute_csum() optimized for IP headers,
- *      which always checksum on 4 octet boundaries.
- *
- *      i386 version by Jorge Cwik <jorge@laser.satlink.net>, adapted
- *      for linux by * Arnt Gulbrandsen.
- */
-static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
-{
-        unsigned int sum, __dummy0, __dummy1;
-
-        __asm__ __volatile__(
-                "mov.l  @%1+, %0\n\t"
-                "mov.l  @%1+, %3\n\t"
-                "add    #-2, %2\n\t"
-                "clrt\n\t"
-                "1:\t"
-                "addc   %3, %0\n\t"
-                "movt   %4\n\t"
-                "mov.l  @%1+, %3\n\t"
-                "dt     %2\n\t"
-                "bf/s   1b\n\t"
-                " cmp/eq #1, %4\n\t"
-                "addc   %3, %0\n\t"
-                "addc   %2, %0"     /* Here %2 is 0, add carry-bit */
-        /* Since the input registers which are loaded with iph and ihl
-           are modified, we must also specify them as outputs, or gcc
-           will assume they contain their original values. */
-        : "=r" (sum), "=r" (iph), "=r" (ihl), "=&r" (__dummy0), "=&z" (__dummy1)
-        : "1" (iph), "2" (ihl)
-        : "t");
-
-        return  csum_fold(sum);
-}
-
-static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
-                                        __wsum sum)
-{
-#ifdef __LITTLE_ENDIAN__
-        unsigned long len_proto = (proto + len) << 8;
+#ifdef CONFIG_SUPERH32
+# include "checksum_32.h"
 #else
-        unsigned long len_proto = proto + len;
+# include "checksum_64.h"
 #endif
-        __asm__("clrt\n\t"
-                "addc   %0, %1\n\t"
-                "addc   %2, %1\n\t"
-                "addc   %3, %1\n\t"
-                "movt   %0\n\t"
-                "add    %1, %0"
-                : "=r" (sum), "=r" (len_proto)
-                : "r" (daddr), "r" (saddr), "1" (len_proto), "0" (sum)
-                : "t");
-
-        return sum;
-}
-
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
-                                        __wsum sum)
-{
-        return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
-}
-
-/*
- * this routine is used for miscellaneous IP-like checksums, mainly
- * in icmp.c
- */
-static inline __sum16 ip_compute_csum(const void *buff, int len)
-{
-    return csum_fold(csum_partial(buff, len, 0));
-}
-
-#define _HAVE_ARCH_IPV6_CSUM
-static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
-                                      const struct in6_addr *daddr,
-                                      __u32 len, unsigned short proto,
-                                      __wsum sum)
-{
-        unsigned int __dummy;
-        __asm__("clrt\n\t"
-                "mov.l  @(0,%2), %1\n\t"
-                "addc   %1, %0\n\t"
-                "mov.l  @(4,%2), %1\n\t"
-                "addc   %1, %0\n\t"
-                "mov.l  @(8,%2), %1\n\t"
-                "addc   %1, %0\n\t"
-                "mov.l  @(12,%2), %1\n\t"
-                "addc   %1, %0\n\t"
-                "mov.l  @(0,%3), %1\n\t"
-                "addc   %1, %0\n\t"
-                "mov.l  @(4,%3), %1\n\t"
-                "addc   %1, %0\n\t"
-                "mov.l  @(8,%3), %1\n\t"
-                "addc   %1, %0\n\t"
-                "mov.l  @(12,%3), %1\n\t"
-                "addc   %1, %0\n\t"
-                "addc   %4, %0\n\t"
-                "addc   %5, %0\n\t"
-                "movt   %1\n\t"
-                "add    %1, %0\n"
-                : "=r" (sum), "=&r" (__dummy)
-                : "r" (saddr), "r" (daddr),
-                  "r" (htonl(len)), "r" (htonl(proto)), "0" (sum)
-                : "t");
-
-        return csum_fold(sum);
-}
-
-/*
- *      Copy and checksum to user
- */
-#define HAVE_CSUM_COPY_USER
-static inline __wsum csum_and_copy_to_user(const void *src,
-                                           void __user *dst,
-                                           int len, __wsum sum,
-                                           int *err_ptr)
-{
-        if (access_ok(VERIFY_WRITE, dst, len))
-                return csum_partial_copy_generic((__force const void *)src,
-                                                dst, len, sum, NULL, err_ptr);
-
-        if (len)
-                *err_ptr = -EFAULT;
-
-        return (__force __wsum)-1; /* invalid checksum */
-}
-#endif /* __ASM_SH_CHECKSUM_H */
diff --git a/include/asm-sh/checksum_32.h b/include/asm-sh/checksum_32.h
new file mode 100644
index 000000000000..4bc8357e8892
--- /dev/null
+++ b/include/asm-sh/checksum_32.h
@@ -0,0 +1,215 @@
+#ifndef __ASM_SH_CHECKSUM_H
+#define __ASM_SH_CHECKSUM_H
+
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1999 by Kaz Kojima & Niibe Yutaka
+ */
+
+#include <linux/in6.h>
+
+/*
+ * computes the checksum of a memory block at buff, length len,
+ * and adds in "sum" (32-bit)
+ *
+ * returns a 32-bit number suitable for feeding into itself
+ * or csum_tcpudp_magic
+ *
+ * this function must be called with even lengths, except
+ * for the last fragment, which may be odd
+ *
+ * it's best to have buff aligned on a 32-bit boundary
+ */
+asmlinkage __wsum csum_partial(const void *buff, int len, __wsum sum);
+
+/*
+ * the same as csum_partial, but copies from src while it
+ * checksums, and handles user-space pointer exceptions correctly, when needed.
+ *
+ * here even more important to align src and dst on a 32-bit (or even
+ * better 64-bit) boundary
+ */
+
+asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
+                                            int len, __wsum sum,
+                                            int *src_err_ptr, int *dst_err_ptr);
+
+/*
+ *      Note: when you get a NULL pointer exception here this means someone
+ *      passed in an incorrect kernel address to one of these functions.
+ *
+ *      If you use these functions directly please don't forget the
+ *      access_ok().
+ */
+static inline
+__wsum csum_partial_copy_nocheck(const void *src, void *dst,
+                                 int len, __wsum sum)
+{
+        return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);
+}
+
+static inline
+__wsum csum_partial_copy_from_user(const void __user *src, void *dst,
+                                   int len, __wsum sum, int *err_ptr)
+{
+        return csum_partial_copy_generic((__force const void *)src, dst,
+                                        len, sum, err_ptr, NULL);
+}
+
+/*
+ *      Fold a partial checksum
+ */
+
+static inline __sum16 csum_fold(__wsum sum)
+{
+        unsigned int __dummy;
+        __asm__("swap.w %0, %1\n\t"
+                "extu.w %0, %0\n\t"
+                "extu.w %1, %1\n\t"
+                "add    %1, %0\n\t"
+                "swap.w %0, %1\n\t"
+                "add    %1, %0\n\t"
+                "not    %0, %0\n\t"
+                : "=r" (sum), "=&r" (__dummy)
+                : "0" (sum)
+                : "t");
+        return (__force __sum16)sum;
+}
+
+/*
+ *      This is a version of ip_compute_csum() optimized for IP headers,
+ *      which always checksum on 4 octet boundaries.
+ *
+ *      i386 version by Jorge Cwik <jorge@laser.satlink.net>, adapted
+ *      for linux by * Arnt Gulbrandsen.
+ */
+static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
+{
+        unsigned int sum, __dummy0, __dummy1;
+
+        __asm__ __volatile__(
+                "mov.l  @%1+, %0\n\t"
+                "mov.l  @%1+, %3\n\t"
+                "add    #-2, %2\n\t"
+                "clrt\n\t"
+                "1:\t"
+                "addc   %3, %0\n\t"
+                "movt   %4\n\t"
+                "mov.l  @%1+, %3\n\t"
+                "dt     %2\n\t"
+                "bf/s   1b\n\t"
+                " cmp/eq #1, %4\n\t"
+                "addc   %3, %0\n\t"
+                "addc   %2, %0"     /* Here %2 is 0, add carry-bit */
+        /* Since the input registers which are loaded with iph and ihl
+           are modified, we must also specify them as outputs, or gcc
+           will assume they contain their original values. */
+        : "=r" (sum), "=r" (iph), "=r" (ihl), "=&r" (__dummy0), "=&z" (__dummy1)
+        : "1" (iph), "2" (ihl)
+        : "t");
+
+        return  csum_fold(sum);
+}
+
+static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
+                                        unsigned short len,
+                                        unsigned short proto,
+                                        __wsum sum)
+{
+#ifdef __LITTLE_ENDIAN__
+        unsigned long len_proto = (proto + len) << 8;
+#else
+        unsigned long len_proto = proto + len;
+#endif
+        __asm__("clrt\n\t"
+                "addc   %0, %1\n\t"
+                "addc   %2, %1\n\t"
+                "addc   %3, %1\n\t"
+                "movt   %0\n\t"
+                "add    %1, %0"
+                : "=r" (sum), "=r" (len_proto)
+                : "r" (daddr), "r" (saddr), "1" (len_proto), "0" (sum)
+                : "t");
+
+        return sum;
+}
+
+/*
+ * computes the checksum of the TCP/UDP pseudo-header
+ * returns a 16-bit checksum, already complemented
+ */
+static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
+                                        unsigned short len,
+                                        unsigned short proto,
+                                        __wsum sum)
+{
+        return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
+}
+
+/*
+ * this routine is used for miscellaneous IP-like checksums, mainly
+ * in icmp.c
+ */
+static inline __sum16 ip_compute_csum(const void *buff, int len)
+{
+    return csum_fold(csum_partial(buff, len, 0));
+}
+
+#define _HAVE_ARCH_IPV6_CSUM
+static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
+                                      const struct in6_addr *daddr,
+                                      __u32 len, unsigned short proto,
+                                      __wsum sum)
+{
+        unsigned int __dummy;
+        __asm__("clrt\n\t"
+                "mov.l  @(0,%2), %1\n\t"
+                "addc   %1, %0\n\t"
+                "mov.l  @(4,%2), %1\n\t"
+                "addc   %1, %0\n\t"
+                "mov.l  @(8,%2), %1\n\t"
+                "addc   %1, %0\n\t"
+                "mov.l  @(12,%2), %1\n\t"
+                "addc   %1, %0\n\t"
+                "mov.l  @(0,%3), %1\n\t"
+                "addc   %1, %0\n\t"
+                "mov.l  @(4,%3), %1\n\t"
+                "addc   %1, %0\n\t"
+                "mov.l  @(8,%3), %1\n\t"
+                "addc   %1, %0\n\t"
+                "mov.l  @(12,%3), %1\n\t"
+                "addc   %1, %0\n\t"
+                "addc   %4, %0\n\t"
+                "addc   %5, %0\n\t"
+                "movt   %1\n\t"
+                "add    %1, %0\n"
+                : "=r" (sum), "=&r" (__dummy)
+                : "r" (saddr), "r" (daddr),
+                  "r" (htonl(len)), "r" (htonl(proto)), "0" (sum)
+                : "t");
+
+        return csum_fold(sum);
+}
+
+/*
+ *      Copy and checksum to user
+ */
+#define HAVE_CSUM_COPY_USER
+static inline __wsum csum_and_copy_to_user(const void *src,
+                                           void __user *dst,
+                                           int len, __wsum sum,
+                                           int *err_ptr)
+{
+        if (access_ok(VERIFY_WRITE, dst, len))
+                return csum_partial_copy_generic((__force const void *)src,
+                                                dst, len, sum, NULL, err_ptr);
+
+        if (len)
+                *err_ptr = -EFAULT;
+
+        return (__force __wsum)-1; /* invalid checksum */
+}
+#endif /* __ASM_SH_CHECKSUM_H */
diff --git a/include/asm-sh64/checksum.h b/include/asm-sh/checksum_64.h
index ba594ccb42e5..9c62a031a8f5 100644
--- a/include/asm-sh64/checksum.h
+++ b/include/asm-sh/checksum_64.h
@@ -1,19 +1,16 @@
-#ifndef __ASM_SH64_CHECKSUM_H
-#define __ASM_SH64_CHECKSUM_H
+#ifndef __ASM_SH_CHECKSUM_64_H
+#define __ASM_SH_CHECKSUM_64_H
 
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/checksum.h
+ * include/asm-sh/checksum_64.h
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
 
-#include <asm/registers.h>
-
 /*
  * computes the checksum of a memory block at buff, length len,
  * and adds in "sum" (32-bit)
@@ -78,5 +75,4 @@ static inline __sum16 ip_compute_csum(const void *buff, int len)
         return csum_fold(csum_partial(buff, len, 0));
 }
 
-#endif /* __ASM_SH64_CHECKSUM_H */
-
+#endif /* __ASM_SH_CHECKSUM_64_H */
diff --git a/include/asm-sh/cmpxchg-grb.h b/include/asm-sh/cmpxchg-grb.h
new file mode 100644
index 000000000000..e2681abe764f
--- /dev/null
+++ b/include/asm-sh/cmpxchg-grb.h
@@ -0,0 +1,70 @@
+#ifndef __ASM_SH_CMPXCHG_GRB_H
+#define __ASM_SH_CMPXCHG_GRB_H
+
+static inline unsigned long xchg_u32(volatile u32 *m, unsigned long val)
+{
+        unsigned long retval;
+
+        __asm__ __volatile__ (
+                "   .align 2              \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   nop                   \n\t"
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov    #-4,   r15     \n\t" /* LOGIN */
+                "   mov.l  @%1,   %0      \n\t" /* load  old value */
+                "   mov.l   %2,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (retval),
+                  "+r"  (m)
+                : "r"   (val)
+                : "memory", "r0", "r1");
+
+        return retval;
+}
+
+static inline unsigned long xchg_u8(volatile u8 *m, unsigned long val)
+{
+        unsigned long retval;
+
+        __asm__ __volatile__ (
+                "   .align  2             \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov    #-6,   r15     \n\t" /* LOGIN */
+                "   mov.b  @%1,   %0      \n\t" /* load  old value */
+                "   extu.b  %0,   %0      \n\t" /* extend as unsigned */
+                "   mov.b   %2,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (retval),
+                  "+r"  (m)
+                : "r"   (val)
+                : "memory" , "r0", "r1");
+
+        return retval;
+}
+
+static inline unsigned long __cmpxchg_u32(volatile int *m, unsigned long old,
+                                          unsigned long new)
+{
+        unsigned long retval;
+
+        __asm__ __volatile__ (
+                "   .align  2             \n\t"
+                "   mova    1f,   r0      \n\t" /* r0 = end point */
+                "   nop                   \n\t"
+                "   mov    r15,   r1      \n\t" /* r1 = saved sp */
+                "   mov    #-8,   r15     \n\t" /* LOGIN */
+                "   mov.l  @%1,   %0      \n\t" /* load  old value */
+                "   cmp/eq  %0,   %2      \n\t"
+                "   bf            1f      \n\t" /* if not equal */
+                "   mov.l   %2,   @%1     \n\t" /* store new value */
+                "1: mov     r1,   r15     \n\t" /* LOGOUT */
+                : "=&r" (retval),
+                  "+r"  (m)
+                : "r"   (new)
+                : "memory" , "r0", "r1", "t");
+
+        return retval;
+}
+
+#endif /* __ASM_SH_CMPXCHG_GRB_H */
diff --git a/include/asm-sh/cmpxchg-irq.h b/include/asm-sh/cmpxchg-irq.h
new file mode 100644
index 000000000000..43049ec0554b
--- /dev/null
+++ b/include/asm-sh/cmpxchg-irq.h
@@ -0,0 +1,40 @@
+#ifndef __ASM_SH_CMPXCHG_IRQ_H
+#define __ASM_SH_CMPXCHG_IRQ_H
+
+static inline unsigned long xchg_u32(volatile u32 *m, unsigned long val)
+{
+        unsigned long flags, retval;
+
+        local_irq_save(flags);
+        retval = *m;
+        *m = val;
+        local_irq_restore(flags);
+        return retval;
+}
+
+static inline unsigned long xchg_u8(volatile u8 *m, unsigned long val)
+{
+        unsigned long flags, retval;
+
+        local_irq_save(flags);
+        retval = *m;
+        *m = val & 0xff;
+        local_irq_restore(flags);
+        return retval;
+}
+
+static inline unsigned long __cmpxchg_u32(volatile int *m, unsigned long old,
+        unsigned long new)
+{
+        __u32 retval;
+        unsigned long flags;
+
+        local_irq_save(flags);
+        retval = *m;
+        if (retval == old)
+                *m = new;
+        local_irq_restore(flags);       /* implies memory barrier  */
+        return retval;
+}
+
+#endif /* __ASM_SH_CMPXCHG_IRQ_H */
diff --git a/include/asm-sh/cpu-sh2/addrspace.h b/include/asm-sh/cpu-sh2/addrspace.h
index 8706c903c5a0..2b9ab93efa4e 100644
--- a/include/asm-sh/cpu-sh2/addrspace.h
+++ b/include/asm-sh/cpu-sh2/addrspace.h
@@ -10,7 +10,10 @@
 #ifndef __ASM_CPU_SH2_ADDRSPACE_H
 #define __ASM_CPU_SH2_ADDRSPACE_H
 
-/* Should fill here */
+#define P0SEG           0x00000000
+#define P1SEG           0x80000000
+#define P2SEG           0xa0000000
+#define P3SEG           0xc0000000
+#define P4SEG           0xe0000000
 
 #endif /* __ASM_CPU_SH2_ADDRSPACE_H */
-
diff --git a/include/asm-sh/cpu-sh2/cache.h b/include/asm-sh/cpu-sh2/cache.h
index f02ba7a672b2..4e0b16500686 100644
--- a/include/asm-sh/cpu-sh2/cache.h
+++ b/include/asm-sh/cpu-sh2/cache.h
@@ -12,9 +12,13 @@
 
 #define L1_CACHE_SHIFT  4
 
+#define SH_CACHE_VALID          1
+#define SH_CACHE_UPDATED        2
+#define SH_CACHE_COMBINED       4
+#define SH_CACHE_ASSOC          8
+
 #if defined(CONFIG_CPU_SUBTYPE_SH7619)
-#define CCR1            0xffffffec
-#define CCR             CCR1
+#define CCR             0xffffffec
 
 #define CCR_CACHE_CE    0x01    /* Cache enable */
 #define CCR_CACHE_WT    0x06    /* CCR[bit1=1,bit2=1] */
diff --git a/include/asm-sh/cpu-sh2/rtc.h b/include/asm-sh/cpu-sh2/rtc.h
new file mode 100644
index 000000000000..39e2d6e94782
--- /dev/null
+++ b/include/asm-sh/cpu-sh2/rtc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_CPU_SH2_RTC_H
+#define __ASM_SH_CPU_SH2_RTC_H
+
+#define rtc_reg_size            sizeof(u16)
+#define RTC_BIT_INVERTED        0
+#define RTC_DEF_CAPABILITIES    0UL
+
+#endif /* __ASM_SH_CPU_SH2_RTC_H */
diff --git a/include/asm-sh/cpu-sh2a/addrspace.h b/include/asm-sh/cpu-sh2a/addrspace.h
index 3d2e9aa21522..795ddd6856a3 100644
--- a/include/asm-sh/cpu-sh2a/addrspace.h
+++ b/include/asm-sh/cpu-sh2a/addrspace.h
@@ -1 +1,10 @@
-#include <asm/cpu-sh2/addrspace.h>
+#ifndef __ASM_SH_CPU_SH2A_ADDRSPACE_H
+#define __ASM_SH_CPU_SH2A_ADDRSPACE_H
+
+#define P0SEG           0x00000000
+#define P1SEG           0x00000000
+#define P2SEG           0x20000000
+#define P3SEG           0x00000000
+#define P4SEG           0x80000000
+
+#endif /* __ASM_SH_CPU_SH2A_ADDRSPACE_H */
diff --git a/include/asm-sh/cpu-sh2a/cache.h b/include/asm-sh/cpu-sh2a/cache.h
index 3e4b9e480982..afe228b3f493 100644
--- a/include/asm-sh/cpu-sh2a/cache.h
+++ b/include/asm-sh/cpu-sh2a/cache.h
@@ -12,11 +12,13 @@
 
 #define L1_CACHE_SHIFT  4
 
-#define CCR1            0xfffc1000
-#define CCR2            0xfffc1004
+#define SH_CACHE_VALID          1
+#define SH_CACHE_UPDATED        2
+#define SH_CACHE_COMBINED       4
+#define SH_CACHE_ASSOC          8
 
-/* CCR1 behaves more like the traditional CCR */
-#define CCR             CCR1
+#define CCR             0xfffc1000 /* CCR1 */
+#define CCR2            0xfffc1004
 
 /*
  * Most of the SH-2A CCR1 definitions resemble the SH-4 ones. All others not
@@ -36,4 +38,3 @@
 #define CCR_CACHE_INVALIDATE    (CCR_CACHE_OCI | CCR_CACHE_ICI)
 
 #endif /* __ASM_CPU_SH2A_CACHE_H */
-
diff --git a/include/asm-sh/cpu-sh2a/freq.h b/include/asm-sh/cpu-sh2a/freq.h
index e518fff6d10f..830fd43b6cdc 100644
--- a/include/asm-sh/cpu-sh2a/freq.h
+++ b/include/asm-sh/cpu-sh2a/freq.h
@@ -10,9 +10,7 @@
 #ifndef __ASM_CPU_SH2A_FREQ_H
 #define __ASM_CPU_SH2A_FREQ_H
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7206)
 #define FREQCR  0xfffe0010
-#endif
 
 #endif /* __ASM_CPU_SH2A_FREQ_H */
 
diff --git a/include/asm-sh/cpu-sh2a/rtc.h b/include/asm-sh/cpu-sh2a/rtc.h
new file mode 100644
index 000000000000..afb511e2bed7
--- /dev/null
+++ b/include/asm-sh/cpu-sh2a/rtc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_CPU_SH2A_RTC_H
+#define __ASM_SH_CPU_SH2A_RTC_H
+
+#define rtc_reg_size            sizeof(u16)
+#define RTC_BIT_INVERTED        0
+#define RTC_DEF_CAPABILITIES    RTC_CAP_4_DIGIT_YEAR
+
+#endif /* __ASM_SH_CPU_SH2A_RTC_H */
diff --git a/include/asm-sh/cpu-sh3/addrspace.h b/include/asm-sh/cpu-sh3/addrspace.h
index 872e9e1b548c..0f94726c7d62 100644
--- a/include/asm-sh/cpu-sh3/addrspace.h
+++ b/include/asm-sh/cpu-sh3/addrspace.h
@@ -10,7 +10,10 @@
 #ifndef __ASM_CPU_SH3_ADDRSPACE_H
 #define __ASM_CPU_SH3_ADDRSPACE_H
 
-/* Should fill here */
+#define P0SEG           0x00000000
+#define P1SEG           0x80000000
+#define P2SEG           0xa0000000
+#define P3SEG           0xc0000000
+#define P4SEG           0xe0000000
 
 #endif /* __ASM_CPU_SH3_ADDRSPACE_H */
-
diff --git a/include/asm-sh/cpu-sh3/cache.h b/include/asm-sh/cpu-sh3/cache.h
index 255016fc91f0..56bd838b7db4 100644
--- a/include/asm-sh/cpu-sh3/cache.h
+++ b/include/asm-sh/cpu-sh3/cache.h
@@ -12,6 +12,11 @@
 
 #define L1_CACHE_SHIFT  4
 
+#define SH_CACHE_VALID          1
+#define SH_CACHE_UPDATED        2
+#define SH_CACHE_COMBINED       4
+#define SH_CACHE_ASSOC          8
+
 #define CCR             0xffffffec      /* Address of Cache Control Register */
 
 #define CCR_CACHE_CE    0x01    /* Cache Enable */
@@ -28,7 +33,8 @@
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \
     defined(CONFIG_CPU_SUBTYPE_SH7710) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7720)
+    defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)
 #define CCR3    0xa40000b4
 #define CCR_CACHE_16KB  0x00010000
 #define CCR_CACHE_32KB  0x00020000
diff --git a/include/asm-sh/cpu-sh3/dma.h b/include/asm-sh/cpu-sh3/dma.h
index 54bfece328c2..092ff9d872c3 100644
--- a/include/asm-sh/cpu-sh3/dma.h
+++ b/include/asm-sh/cpu-sh3/dma.h
@@ -2,7 +2,9 @@
 #define __ASM_CPU_SH3_DMA_H
 
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7720) || defined(CONFIG_CPU_SUBTYPE_SH7709)
+#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7709)
 #define SH_DMAC_BASE    0xa4010020
 
 #define DMTE0_IRQ       48
diff --git a/include/asm-sh/cpu-sh3/freq.h b/include/asm-sh/cpu-sh3/freq.h
index 0a054b53b9de..53c62302b2e3 100644
--- a/include/asm-sh/cpu-sh3/freq.h
+++ b/include/asm-sh/cpu-sh3/freq.h
@@ -10,7 +10,12 @@
 #ifndef __ASM_CPU_SH3_FREQ_H
 #define __ASM_CPU_SH3_FREQ_H
 
+#ifdef CONFIG_CPU_SUBTYPE_SH7712
+#define FRQCR                   0xA415FF80
+#else
 #define FRQCR                   0xffffff80
+#endif
+
 #define MIN_DIVISOR_NR          0
 #define MAX_DIVISOR_NR          4
 
diff --git a/include/asm-sh/cpu-sh3/gpio.h b/include/asm-sh/cpu-sh3/gpio.h
index 48770c1c7bdf..4e53eb314b8f 100644
--- a/include/asm-sh/cpu-sh3/gpio.h
+++ b/include/asm-sh/cpu-sh3/gpio.h
@@ -12,7 +12,8 @@
 #ifndef _CPU_SH3_GPIO_H
 #define _CPU_SH3_GPIO_H
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7720)
+#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)
 
 /* Control registers */
 #define PORT_PACR       0xA4050100UL
diff --git a/include/asm-sh/cpu-sh3/mmu_context.h b/include/asm-sh/cpu-sh3/mmu_context.h
index 16c2d63b7e39..ab09da73ce77 100644
--- a/include/asm-sh/cpu-sh3/mmu_context.h
+++ b/include/asm-sh/cpu-sh3/mmu_context.h
@@ -33,7 +33,8 @@
     defined(CONFIG_CPU_SUBTYPE_SH7709) || \
     defined(CONFIG_CPU_SUBTYPE_SH7710) || \
     defined(CONFIG_CPU_SUBTYPE_SH7712) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7720)
+    defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)
 #define INTEVT  0xa4000000      /* INTEVTE2(0xa4000000) */
 #else
 #define INTEVT  0xffffffd8
diff --git a/include/asm-sh/cpu-sh3/rtc.h b/include/asm-sh/cpu-sh3/rtc.h
new file mode 100644
index 000000000000..319404aaee37
--- /dev/null
+++ b/include/asm-sh/cpu-sh3/rtc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_CPU_SH3_RTC_H
+#define __ASM_SH_CPU_SH3_RTC_H
+
+#define rtc_reg_size            sizeof(u16)
+#define RTC_BIT_INVERTED        0       /* No bug on SH7708, SH7709A */
+#define RTC_DEF_CAPABILITIES    0UL
+
+#endif /* __ASM_SH_CPU_SH3_RTC_H */
diff --git a/include/asm-sh/cpu-sh3/timer.h b/include/asm-sh/cpu-sh3/timer.h
index 7b795ac5477c..793acf12aa08 100644
--- a/include/asm-sh/cpu-sh3/timer.h
+++ b/include/asm-sh/cpu-sh3/timer.h
@@ -23,12 +23,13 @@
  * ---------------------------------------------------------------------------
  */
 
-#if  !defined(CONFIG_CPU_SUBTYPE_SH7720)
+#if  !defined(CONFIG_CPU_SUBTYPE_SH7720) && !defined(CONFIG_CPU_SUBTYPE_SH7721)
 #define TMU_TOCR        0xfffffe90      /* Byte access */
 #endif
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7710) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7720)
+    defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)
 #define TMU_012_TSTR    0xa412fe92      /* Byte access */
 
 #define TMU0_TCOR       0xa412fe94      /* Long access */
@@ -57,7 +58,7 @@
 #define TMU2_TCOR       0xfffffeac      /* Long access */
 #define TMU2_TCNT       0xfffffeb0      /* Long access */
 #define TMU2_TCR        0xfffffeb4      /* Word access */
-#if !defined(CONFIG_CPU_SUBTYPE_SH7720)
+#if !defined(CONFIG_CPU_SUBTYPE_SH7720) && !defined(CONFIG_CPU_SUBTYPE_SH7721)
 #define TMU2_TCPR2      0xfffffeb8      /* Long access */
 #endif
 #endif
diff --git a/include/asm-sh/cpu-sh3/ubc.h b/include/asm-sh/cpu-sh3/ubc.h
index 18467c574534..4e6381d5ff7a 100644
--- a/include/asm-sh/cpu-sh3/ubc.h
+++ b/include/asm-sh/cpu-sh3/ubc.h
@@ -12,7 +12,8 @@
 #define __ASM_CPU_SH3_UBC_H
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7710) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7720)
+    defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7721)
 #define UBC_BARA                0xa4ffffb0
 #define UBC_BAMRA               0xa4ffffb4
 #define UBC_BBRA                0xa4ffffb8
diff --git a/include/asm-sh/cpu-sh4/addrspace.h b/include/asm-sh/cpu-sh4/addrspace.h
index bb2e1b03060c..a3fa733c1c7d 100644
--- a/include/asm-sh/cpu-sh4/addrspace.h
+++ b/include/asm-sh/cpu-sh4/addrspace.h
@@ -10,6 +10,12 @@
 #ifndef __ASM_CPU_SH4_ADDRSPACE_H
 #define __ASM_CPU_SH4_ADDRSPACE_H
 
+#define P0SEG           0x00000000
+#define P1SEG           0x80000000
+#define P2SEG           0xa0000000
+#define P3SEG           0xc0000000
+#define P4SEG           0xe0000000
+
 /* Detailed P4SEG  */
 #define P4SEG_STORE_QUE (P4SEG)
 #define P4SEG_IC_ADDR   0xf0000000
diff --git a/include/asm-sh/cpu-sh4/cache.h b/include/asm-sh/cpu-sh4/cache.h
index f92b20a0983d..1c61ebf5c8e3 100644
--- a/include/asm-sh/cpu-sh4/cache.h
+++ b/include/asm-sh/cpu-sh4/cache.h
@@ -12,6 +12,11 @@
 
 #define L1_CACHE_SHIFT  5
 
+#define SH_CACHE_VALID          1
+#define SH_CACHE_UPDATED        2
+#define SH_CACHE_COMBINED       4
+#define SH_CACHE_ASSOC          8
+
 #define CCR             0xff00001c      /* Address of Cache Control Register */
 #define CCR_CACHE_OCE   0x0001  /* Operand Cache Enable */
 #define CCR_CACHE_WT    0x0002  /* Write-Through (for P0,U0,P3) (else writeback)*/
diff --git a/include/asm-sh/cpu-sh4/fpu.h b/include/asm-sh/cpu-sh4/fpu.h
new file mode 100644
index 000000000000..febef7342528
--- /dev/null
+++ b/include/asm-sh/cpu-sh4/fpu.h
@@ -0,0 +1,32 @@
+/*
+ * linux/arch/sh/kernel/cpu/sh4/sh4_fpu.h
+ *
+ * Copyright (C) 2006 STMicroelectronics Limited
+ * Author: Carl Shaw <carl.shaw@st.com>
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License Version 2.  See linux/COPYING for more information.
+ *
+ * Definitions for SH4 FPU operations
+ */
+
+#ifndef __CPU_SH4_FPU_H
+#define __CPU_SH4_FPU_H
+
+#define FPSCR_ENABLE_MASK       0x00000f80UL
+
+#define FPSCR_FMOV_DOUBLE       (1<<1)
+
+#define FPSCR_CAUSE_INEXACT     (1<<12)
+#define FPSCR_CAUSE_UNDERFLOW   (1<<13)
+#define FPSCR_CAUSE_OVERFLOW    (1<<14)
+#define FPSCR_CAUSE_DIVZERO     (1<<15)
+#define FPSCR_CAUSE_INVALID     (1<<16)
+#define FPSCR_CAUSE_ERROR       (1<<17)
+
+#define FPSCR_DBL_PRECISION     (1<<19)
+#define FPSCR_ROUNDING_MODE(x)  ((x >> 20) & 3)
+#define FPSCR_RM_NEAREST        (0)
+#define FPSCR_RM_ZERO           (1)
+
+#endif
diff --git a/include/asm-sh/cpu-sh4/freq.h b/include/asm-sh/cpu-sh4/freq.h
index dc1d32a86374..1ac10b9a078f 100644
--- a/include/asm-sh/cpu-sh4/freq.h
+++ b/include/asm-sh/cpu-sh4/freq.h
@@ -16,7 +16,8 @@
 #define SCLKACR                 0xa4150008
 #define SCLKBCR                 0xa415000c
 #define IrDACLKCR               0xa4150010
-#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7780)
 #define FRQCR                   0xffc80000
 #elif defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define FRQCR0                  0xffc80000
diff --git a/include/asm-sh/cpu-sh4/mmu_context.h b/include/asm-sh/cpu-sh4/mmu_context.h
index 979acddc0f8e..9ea8eb27b18e 100644
--- a/include/asm-sh/cpu-sh4/mmu_context.h
+++ b/include/asm-sh/cpu-sh4/mmu_context.h
@@ -22,12 +22,20 @@
 #define MMU_UTLB_ADDRESS_ARRAY  0xF6000000
 #define MMU_PAGE_ASSOC_BIT      0x80
 
+#define MMUCR_TI                (1<<2)
+
 #ifdef CONFIG_X2TLB
 #define MMUCR_ME                (1 << 7)
 #else
 #define MMUCR_ME                (0)
 #endif
 
+#if defined(CONFIG_32BIT) && defined(CONFIG_CPU_SUBTYPE_ST40)
+#define MMUCR_SE                (1 << 4)
+#else
+#define MMUCR_SE                (0)
+#endif
+
 #ifdef CONFIG_SH_STORE_QUEUES
 #define MMUCR_SQMD              (1 << 9)
 #else
@@ -35,7 +43,7 @@
 #endif
 
 #define MMU_NTLB_ENTRIES        64
-#define MMU_CONTROL_INIT        (0x05|MMUCR_SQMD|MMUCR_ME)
+#define MMU_CONTROL_INIT        (0x05|MMUCR_SQMD|MMUCR_ME|MMUCR_SE)
 
 #define MMU_ITLB_DATA_ARRAY     0xF3000000
 #define MMU_UTLB_DATA_ARRAY     0xF7000000
diff --git a/include/asm-sh/cpu-sh4/rtc.h b/include/asm-sh/cpu-sh4/rtc.h
new file mode 100644
index 000000000000..f3d0f53275e4
--- /dev/null
+++ b/include/asm-sh/cpu-sh4/rtc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_CPU_SH4_RTC_H
+#define __ASM_SH_CPU_SH4_RTC_H
+
+#define rtc_reg_size            sizeof(u32)
+#define RTC_BIT_INVERTED        0x40    /* bug on SH7750, SH7750S */
+#define RTC_DEF_CAPABILITIES    RTC_CAP_4_DIGIT_YEAR
+
+#endif /* __ASM_SH_CPU_SH4_RTC_H */
diff --git a/include/asm-sh/cpu-sh5/addrspace.h b/include/asm-sh/cpu-sh5/addrspace.h
new file mode 100644
index 000000000000..dc36b9a03af6
--- /dev/null
+++ b/include/asm-sh/cpu-sh5/addrspace.h
@@ -0,0 +1,11 @@
+#ifndef __ASM_SH_CPU_SH5_ADDRSPACE_H
+#define __ASM_SH_CPU_SH5_ADDRSPACE_H
+
+#define PHYS_PERIPHERAL_BLOCK   0x09000000
+#define PHYS_DMAC_BLOCK         0x0e000000
+#define PHYS_PCI_BLOCK          0x60000000
+#define PHYS_EMI_BLOCK          0xff000000
+
+/* No segmentation.. */
+
+#endif /* __ASM_SH_CPU_SH5_ADDRSPACE_H */
diff --git a/include/asm-sh64/cache.h b/include/asm-sh/cpu-sh5/cache.h
index a4f36f0036e1..ed050ab526f2 100644
--- a/include/asm-sh64/cache.h
+++ b/include/asm-sh/cpu-sh5/cache.h
@@ -1,33 +1,30 @@
-#ifndef __ASM_SH64_CACHE_H
-#define __ASM_SH64_CACHE_H
+#ifndef __ASM_SH_CPU_SH5_CACHE_H
+#define __ASM_SH_CPU_SH5_CACHE_H
 
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/cache.h
+ * include/asm-sh/cpu-sh5/cache.h
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003, 2004  Paul Mundt
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-#include <asm/cacheflush.h>
 
 #define L1_CACHE_SHIFT          5
-/* bytes per L1 cache line */
-#define L1_CACHE_BYTES          (1 << L1_CACHE_SHIFT)
-#define L1_CACHE_ALIGN_MASK     (~(L1_CACHE_BYTES - 1))
-#define L1_CACHE_ALIGN(x)       (((x)+(L1_CACHE_BYTES - 1)) & L1_CACHE_ALIGN_MASK)
-#define L1_CACHE_SIZE_BYTES     (L1_CACHE_BYTES << 10)
-
-#ifdef MODULE
-#define __cacheline_aligned __attribute__((__aligned__(L1_CACHE_BYTES)))
-#else
-#define __cacheline_aligned                                     \
-  __attribute__((__aligned__(L1_CACHE_BYTES),                   \
-                 __section__(".data.cacheline_aligned")))
-#endif
+
+/* Valid and Dirty bits */
+#define SH_CACHE_VALID          (1LL<<0)
+#define SH_CACHE_UPDATED        (1LL<<57)
+
+/* Unimplemented compat bits.. */
+#define SH_CACHE_COMBINED       0
+#define SH_CACHE_ASSOC          0
+
+/* Cache flags */
+#define SH_CACHE_MODE_WT        (1LL<<0)
+#define SH_CACHE_MODE_WB        (1LL<<1)
 
 /*
  * Control Registers.
@@ -58,7 +55,6 @@
 
 #define OCCR1_NOLOCK    0x0             /* Set No Locking */
 
-
 /*
  * SH-5
  * A bit of description here, for neff=32.
@@ -77,43 +73,6 @@
  *
  */
 
-/* Valid and Dirty bits */
-#define SH_CACHE_VALID          (1LL<<0)
-#define SH_CACHE_UPDATED        (1LL<<57)
-
-/* Cache flags */
-#define SH_CACHE_MODE_WT        (1LL<<0)
-#define SH_CACHE_MODE_WB        (1LL<<1)
-
-#ifndef __ASSEMBLY__
-
-/*
- * Cache information structure.
- *
- * Defined for both I and D cache, per-processor.
- */
-struct cache_info {
-        unsigned int ways;
-        unsigned int sets;
-        unsigned int linesz;
-
-        unsigned int way_shift;
-        unsigned int entry_shift;
-        unsigned int set_shift;
-        unsigned int way_step_shift;
-        unsigned int asid_shift;
-
-        unsigned int way_ofs;
-
-        unsigned int asid_mask;
-        unsigned int idx_mask;
-        unsigned int epn_mask;
-
-        unsigned long flags;
-};
-
-#endif /* __ASSEMBLY__ */
-
 /* Instruction cache */
 #define CACHE_IC_ADDRESS_ARRAY 0x01000000
 
@@ -130,10 +89,9 @@ struct cache_info {
 /* Mask to select synonym bit(s) */
 #define CACHE_OC_SYN_MASK   (((1UL<<CACHE_OC_N_SYNBITS)-1)<<CACHE_OC_SYN_SHIFT)
 
-
 /*
  * Instruction cache can't be invalidated based on physical addresses.
  * No Instruction Cache defines required, then.
  */
 
-#endif /* __ASM_SH64_CACHE_H */
+#endif /* __ASM_SH_CPU_SH5_CACHE_H */
diff --git a/include/asm-sh64/cacheflush.h b/include/asm-sh/cpu-sh5/cacheflush.h
index 1e53a47bdc97..98edb5b1da32 100644
--- a/include/asm-sh64/cacheflush.h
+++ b/include/asm-sh/cpu-sh5/cacheflush.h
@@ -1,5 +1,5 @@
-#ifndef __ASM_SH64_CACHEFLUSH_H
-#define __ASM_SH64_CACHEFLUSH_H
+#ifndef __ASM_SH_CPU_SH5_CACHEFLUSH_H
+#define __ASM_SH_CPU_SH5_CACHEFLUSH_H
 
 #ifndef __ASSEMBLY__
 
@@ -26,25 +26,10 @@ extern void flush_icache_user_range(struct vm_area_struct *vma,
 #define flush_dcache_mmap_lock(mapping)         do { } while (0)
 #define flush_dcache_mmap_unlock(mapping)       do { } while (0)
 
-#define flush_cache_vmap(start, end)            flush_cache_all()
-#define flush_cache_vunmap(start, end)          flush_cache_all()
-
 #define flush_icache_page(vma, page)    do { } while (0)
-
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-        do {                                                    \
-                flush_cache_page(vma, vaddr, page_to_pfn(page));\
-                memcpy(dst, src, len);                          \
-                flush_icache_user_range(vma, page, vaddr, len); \
-        } while (0)
-
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-        do {                                                    \
-                flush_cache_page(vma, vaddr, page_to_pfn(page));\
-                memcpy(dst, src, len);                          \
-        } while (0)
+#define p3_cache_init()                 do { } while (0)
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __ASM_SH64_CACHEFLUSH_H */
+#endif /* __ASM_SH_CPU_SH5_CACHEFLUSH_H */
 
diff --git a/include/asm-sh/cpu-sh5/dma.h b/include/asm-sh/cpu-sh5/dma.h
new file mode 100644
index 000000000000..7bf6bb3d35ed
--- /dev/null
+++ b/include/asm-sh/cpu-sh5/dma.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_SH_CPU_SH5_DMA_H
+#define __ASM_SH_CPU_SH5_DMA_H
+
+/* Nothing yet */
+
+#endif /* __ASM_SH_CPU_SH5_DMA_H */
diff --git a/include/asm-sh64/irq.h b/include/asm-sh/cpu-sh5/irq.h
index 5c9e6a873aeb..f0f0756e6e84 100644
--- a/include/asm-sh64/irq.h
+++ b/include/asm-sh/cpu-sh5/irq.h
@@ -1,15 +1,14 @@
-#ifndef __ASM_SH64_IRQ_H
-#define __ASM_SH64_IRQ_H
+#ifndef __ASM_SH_CPU_SH5_IRQ_H
+#define __ASM_SH_CPU_SH5_IRQ_H
 
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/irq.h
+ * include/asm-sh/cpu-sh5/irq.h
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
 
 
@@ -92,9 +91,6 @@
 #define NR_EXT_IRQS     0
 #endif
 
-#define NR_IRQS         (NR_INTC_IRQS+NR_EXT_IRQS)
-
-
 /* Default IRQs, fixed */
 #define TIMER_IRQ       IRQ_TUNI0
 #define RTC_IRQ         IRQ_CUI
@@ -116,29 +112,6 @@
 
 extern int intc_evt_to_irq[(0xE20/0x20)+1];
 int intc_irq_describe(char* p, int irq);
+extern int platform_int_priority[NR_INTC_IRQS];
 
-#define irq_canonicalize(irq)   (irq)
-
-#ifdef CONFIG_SH_CAYMAN
-int cayman_irq_demux(int evt);
-int cayman_irq_describe(char* p, int irq);
-#define irq_demux(x) cayman_irq_demux(x)
-#define irq_describe(p, x) cayman_irq_describe(p, x)
-#else
-#define irq_demux(x) (intc_evt_to_irq[x])
-#define irq_describe(p, x) intc_irq_describe(p, x)
-#endif
-
-/*
- * Function for "on chip support modules".
- */
-
-/*
- * SH-5 supports Priority based interrupts only.
- * Interrupt priorities are defined at platform level.
- */
-#define set_ipr_data(a, b, c, d)
-#define make_ipr_irq(a)
-#define make_imask_irq(a)
-
-#endif /* __ASM_SH64_IRQ_H */
+#endif /* __ASM_SH_CPU_SH5_IRQ_H */
diff --git a/include/asm-sh/cpu-sh5/mmu_context.h b/include/asm-sh/cpu-sh5/mmu_context.h
new file mode 100644
index 000000000000..df857fc09960
--- /dev/null
+++ b/include/asm-sh/cpu-sh5/mmu_context.h
@@ -0,0 +1,27 @@
+#ifndef __ASM_SH_CPU_SH5_MMU_CONTEXT_H
+#define __ASM_SH_CPU_SH5_MMU_CONTEXT_H
+
+/* Common defines */
+#define TLB_STEP        0x00000010
+#define TLB_PTEH        0x00000000
+#define TLB_PTEL        0x00000008
+
+/* PTEH defines */
+#define PTEH_ASID_SHIFT 2
+#define PTEH_VALID      0x0000000000000001
+#define PTEH_SHARED     0x0000000000000002
+#define PTEH_MATCH_ASID 0x00000000000003ff
+
+#ifndef __ASSEMBLY__
+/* This has to be a common function because the next location to fill
+ * information is shared. */
+extern void __do_tlb_refill(unsigned long address, unsigned long long is_text_not_data, pte_t *pte);
+
+/* Profiling counter. */
+#ifdef CONFIG_SH64_PROC_TLB
+extern unsigned long long calls_to_do_fast_page_fault;
+#endif
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_SH_CPU_SH5_MMU_CONTEXT_H */
diff --git a/include/asm-sh64/registers.h b/include/asm-sh/cpu-sh5/registers.h
index 7eec666acf84..6664ea6f1566 100644
--- a/include/asm-sh64/registers.h
+++ b/include/asm-sh/cpu-sh5/registers.h
@@ -1,15 +1,15 @@
-#ifndef __ASM_SH64_REGISTERS_H
-#define __ASM_SH64_REGISTERS_H
+#ifndef __ASM_SH_CPU_SH5_REGISTERS_H
+#define __ASM_SH_CPU_SH5_REGISTERS_H
 
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/registers.h
+ * include/asm-sh/cpu-sh5/registers.h
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2004  Richard Curnow
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
 
 #ifdef __ASSEMBLY__
@@ -103,4 +103,4 @@
 #define __USR __str(USR)
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ASM_SH64_REGISTERS_H */
+#endif /* __ASM_SH_CPU_SH5_REGISTERS_H */
diff --git a/include/asm-sh/cpu-sh5/rtc.h b/include/asm-sh/cpu-sh5/rtc.h
new file mode 100644
index 000000000000..12ea0ed144e1
--- /dev/null
+++ b/include/asm-sh/cpu-sh5/rtc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_CPU_SH5_RTC_H
+#define __ASM_SH_CPU_SH5_RTC_H
+
+#define rtc_reg_size            sizeof(u32)
+#define RTC_BIT_INVERTED        0       /* The SH-5 RTC is surprisingly sane! */
+#define RTC_DEF_CAPABILITIES    RTC_CAP_4_DIGIT_YEAR
+
+#endif /* __ASM_SH_CPU_SH5_RTC_H */
diff --git a/include/asm-sh/cpu-sh5/timer.h b/include/asm-sh/cpu-sh5/timer.h
new file mode 100644
index 000000000000..88da9b341a36
--- /dev/null
+++ b/include/asm-sh/cpu-sh5/timer.h
@@ -0,0 +1,4 @@
+#ifndef __ASM_SH_CPU_SH5_TIMER_H
+#define __ASM_SH_CPU_SH5_TIMER_H
+
+#endif /* __ASM_SH_CPU_SH5_TIMER_H */
diff --git a/include/asm-sh/delay.h b/include/asm-sh/delay.h
index db599b2a5a9c..031db84f2aa1 100644
--- a/include/asm-sh/delay.h
+++ b/include/asm-sh/delay.h
@@ -6,7 +6,7 @@
  *
  * Delay routines calling functions in arch/sh/lib/delay.c
  */
- 
+
 extern void __bad_udelay(void);
 extern void __bad_ndelay(void);
 
@@ -15,13 +15,17 @@ extern void __ndelay(unsigned long nsecs);
 extern void __const_udelay(unsigned long usecs);
 extern void __delay(unsigned long loops);
 
+#ifdef CONFIG_SUPERH32
 #define udelay(n) (__builtin_constant_p(n) ? \
         ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c6ul)) : \
         __udelay(n))
 
-
 #define ndelay(n) (__builtin_constant_p(n) ? \
         ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
         __ndelay(n))
+#else
+extern void udelay(unsigned long usecs);
+extern void ndelay(unsigned long nsecs);
+#endif
 
 #endif /* __ASM_SH_DELAY_H */
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h
index fcea067f7a9c..22cc419389fe 100644
--- a/include/asm-sh/dma-mapping.h
+++ b/include/asm-sh/dma-mapping.h
@@ -8,11 +8,6 @@
 
 extern struct bus_type pci_bus_type;
 
-/* arch/sh/mm/consistent.c */
-extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle);
-extern void consistent_free(void *vaddr, size_t size);
-extern void consistent_sync(void *vaddr, size_t size, int direction);
-
 #define dma_supported(dev, mask)        (1)
 
 static inline int dma_set_mask(struct device *dev, u64 mask)
@@ -25,44 +20,19 @@ static inline int dma_set_mask(struct device *dev, u64 mask)
         return 0;
 }
 
-static inline void *dma_alloc_coherent(struct device *dev, size_t size,
-                         dma_addr_t *dma_handle, gfp_t flag)
-{
-        if (sh_mv.mv_consistent_alloc) {
-                void *ret;
+void *dma_alloc_coherent(struct device *dev, size_t size,
+                         dma_addr_t *dma_handle, gfp_t flag);
 
-                ret = sh_mv.mv_consistent_alloc(dev, size, dma_handle, flag);
-                if (ret != NULL)
-                        return ret;
-        }
-
-        return consistent_alloc(flag, size, dma_handle);
-}
-
-static inline void dma_free_coherent(struct device *dev, size_t size,
-                       void *vaddr, dma_addr_t dma_handle)
-{
-        if (sh_mv.mv_consistent_free) {
-                int ret;
-
-                ret = sh_mv.mv_consistent_free(dev, size, vaddr, dma_handle);
-                if (ret == 0)
-                        return;
-        }
+void dma_free_coherent(struct device *dev, size_t size,
+                       void *vaddr, dma_addr_t dma_handle);
 
-        consistent_free(vaddr, size);
-}
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+                    enum dma_data_direction dir);
 
 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
 #define dma_is_consistent(d, h) (1)
 
-static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
-                                  enum dma_data_direction dir)
-{
-        consistent_sync(vaddr, size, (int)dir);
-}
-
 static inline dma_addr_t dma_map_single(struct device *dev,
                                         void *ptr, size_t size,
                                         enum dma_data_direction dir)
@@ -205,4 +175,18 @@ static inline int dma_mapping_error(dma_addr_t dma_addr)
 {
         return dma_addr == 0;
 }
+
+#define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
+
+extern int
+dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
+                            dma_addr_t device_addr, size_t size, int flags);
+
+extern void
+dma_release_declared_memory(struct device *dev);
+
+extern void *
+dma_mark_declared_memory_occupied(struct device *dev,
+                                  dma_addr_t device_addr, size_t size);
+
 #endif /* __ASM_SH_DMA_MAPPING_H */
diff --git a/include/asm-sh/elf.h b/include/asm-sh/elf.h
index 12cc4b392bf0..05092da1aa59 100644
--- a/include/asm-sh/elf.h
+++ b/include/asm-sh/elf.h
@@ -5,7 +5,7 @@
 #include <asm/ptrace.h>
 #include <asm/user.h>
 
-/* SH relocation types  */
+/* SH (particularly SHcompact) relocation types  */
 #define R_SH_NONE               0
 #define R_SH_DIR32              1
 #define R_SH_REL32              2
@@ -43,6 +43,11 @@
 #define R_SH_RELATIVE           165
 #define R_SH_GOTOFF             166
 #define R_SH_GOTPC              167
+/* SHmedia relocs */
+#define R_SH_IMM_LOW16          246
+#define R_SH_IMM_LOW16_PCREL    247
+#define R_SH_IMM_MEDLOW16       248
+#define R_SH_IMM_MEDLOW16_PCREL 249
 /* Keep this the last entry.  */
 #define R_SH_NUM                256
 
@@ -58,11 +63,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 typedef struct user_fpu_struct elf_fpregset_t;
 
 /*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) ( (x)->e_machine == EM_SH )
-
-/*
  * These are used to set parameters in the core dumps.
  */
 #define ELF_CLASS       ELFCLASS32
@@ -73,6 +73,12 @@ typedef struct user_fpu_struct elf_fpregset_t;
 #endif
 #define ELF_ARCH        EM_SH
 
+#ifdef __KERNEL__
+/*
+ * This is used to ensure we don't load something for the wrong architecture.
+ */
+#define elf_check_arch(x) ( (x)->e_machine == EM_SH )
+
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       PAGE_SIZE
 
@@ -83,7 +89,6 @@ typedef struct user_fpu_struct elf_fpregset_t;
 
 #define ELF_ET_DYN_BASE         (2 * TASK_SIZE / 3)
 
-
 #define ELF_CORE_COPY_REGS(_dest,_regs)                         \
         memcpy((char *) &_dest, (char *) _regs,                 \
                sizeof(struct pt_regs));
@@ -101,16 +106,38 @@ typedef struct user_fpu_struct elf_fpregset_t;
    For the moment, we have only optimizations for the Intel generations,
    but that could change... */
 
-#define ELF_PLATFORM  (NULL)
+#define ELF_PLATFORM    (utsname()->machine)
 
+#ifdef __SH5__
+#define ELF_PLAT_INIT(_r, load_addr) \
+  do { _r->regs[0]=0; _r->regs[1]=0; _r->regs[2]=0; _r->regs[3]=0; \
+       _r->regs[4]=0; _r->regs[5]=0; _r->regs[6]=0; _r->regs[7]=0; \
+       _r->regs[8]=0; _r->regs[9]=0; _r->regs[10]=0; _r->regs[11]=0; \
+       _r->regs[12]=0; _r->regs[13]=0; _r->regs[14]=0; _r->regs[15]=0; \
+       _r->regs[16]=0; _r->regs[17]=0; _r->regs[18]=0; _r->regs[19]=0; \
+       _r->regs[20]=0; _r->regs[21]=0; _r->regs[22]=0; _r->regs[23]=0; \
+       _r->regs[24]=0; _r->regs[25]=0; _r->regs[26]=0; _r->regs[27]=0; \
+       _r->regs[28]=0; _r->regs[29]=0; _r->regs[30]=0; _r->regs[31]=0; \
+       _r->regs[32]=0; _r->regs[33]=0; _r->regs[34]=0; _r->regs[35]=0; \
+       _r->regs[36]=0; _r->regs[37]=0; _r->regs[38]=0; _r->regs[39]=0; \
+       _r->regs[40]=0; _r->regs[41]=0; _r->regs[42]=0; _r->regs[43]=0; \
+       _r->regs[44]=0; _r->regs[45]=0; _r->regs[46]=0; _r->regs[47]=0; \
+       _r->regs[48]=0; _r->regs[49]=0; _r->regs[50]=0; _r->regs[51]=0; \
+       _r->regs[52]=0; _r->regs[53]=0; _r->regs[54]=0; _r->regs[55]=0; \
+       _r->regs[56]=0; _r->regs[57]=0; _r->regs[58]=0; _r->regs[59]=0; \
+       _r->regs[60]=0; _r->regs[61]=0; _r->regs[62]=0; \
+       _r->tregs[0]=0; _r->tregs[1]=0; _r->tregs[2]=0; _r->tregs[3]=0; \
+       _r->tregs[4]=0; _r->tregs[5]=0; _r->tregs[6]=0; _r->tregs[7]=0; \
+       _r->sr = SR_FD | SR_MMU; } while (0)
+#else
 #define ELF_PLAT_INIT(_r, load_addr) \
   do { _r->regs[0]=0; _r->regs[1]=0; _r->regs[2]=0; _r->regs[3]=0; \
        _r->regs[4]=0; _r->regs[5]=0; _r->regs[6]=0; _r->regs[7]=0; \
        _r->regs[8]=0; _r->regs[9]=0; _r->regs[10]=0; _r->regs[11]=0; \
        _r->regs[12]=0; _r->regs[13]=0; _r->regs[14]=0; \
        _r->sr = SR_FD; } while (0)
+#endif
 
-#ifdef __KERNEL__
 #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
 struct task_struct;
 extern int dump_task_regs (struct task_struct *, elf_gregset_t *);
@@ -118,7 +145,6 @@ extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *);
 
 #define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
 #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
-#endif
 
 #ifdef CONFIG_VSYSCALL
 /* vDSO has arch_setup_additional_pages */
@@ -133,12 +159,35 @@ extern void __kernel_vsyscall;
 #define VDSO_BASE               ((unsigned long)current->mm->context.vdso)
 #define VDSO_SYM(x)             (VDSO_BASE + (unsigned long)(x))
 
+#define VSYSCALL_AUX_ENT                                        \
+        if (vdso_enabled)                                       \
+                NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);
+#else
+#define VSYSCALL_AUX_ENT
+#endif /* CONFIG_VSYSCALL */
+
+#ifdef CONFIG_SH_FPU
+#define FPU_AUX_ENT     NEW_AUX_ENT(AT_FPUCW, FPSCR_INIT)
+#else
+#define FPU_AUX_ENT
+#endif
+
+extern int l1i_cache_shape, l1d_cache_shape, l2_cache_shape;
+
 /* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */
 #define ARCH_DLINFO                                             \
 do {                                                            \
-        if (vdso_enabled)                                       \
-                NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);        \
+        /* Optional FPU initialization */                       \
+        FPU_AUX_ENT;                                            \
+                                                                \
+        /* Optional vsyscall entry */                           \
+        VSYSCALL_AUX_ENT;                                       \
+                                                                \
+        /* Cache desc */                                        \
+        NEW_AUX_ENT(AT_L1I_CACHESHAPE, l1i_cache_shape);        \
+        NEW_AUX_ENT(AT_L1D_CACHESHAPE, l1d_cache_shape);        \
+        NEW_AUX_ENT(AT_L2_CACHESHAPE, l2_cache_shape);          \
 } while (0)
-#endif /* CONFIG_VSYSCALL */
 
+#endif /* __KERNEL__ */
 #endif /* __ASM_SH_ELF_H */
diff --git a/include/asm-sh/fixmap.h b/include/asm-sh/fixmap.h
index 8a566177ad96..721fcc4d5e98 100644
--- a/include/asm-sh/fixmap.h
+++ b/include/asm-sh/fixmap.h
@@ -49,6 +49,7 @@ enum fixed_addresses {
 #define FIX_N_COLOURS 16
         FIX_CMAP_BEGIN,
         FIX_CMAP_END = FIX_CMAP_BEGIN + FIX_N_COLOURS,
+        FIX_UNCACHED,
 #ifdef CONFIG_HIGHMEM
         FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
         FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
@@ -73,7 +74,11 @@ extern void __set_fixmap(enum fixed_addresses idx,
  * the start of the fixmap, and leave one page empty
  * at the top of mem..
  */
+#ifdef CONFIG_SUPERH32
 #define FIXADDR_TOP     (P4SEG - PAGE_SIZE)
+#else
+#define FIXADDR_TOP     (0xff000000 - PAGE_SIZE)
+#endif
 #define FIXADDR_SIZE    (__end_of_fixed_addresses << PAGE_SHIFT)
 #define FIXADDR_START   (FIXADDR_TOP - FIXADDR_SIZE)
 
diff --git a/include/asm-sh/flat.h b/include/asm-sh/flat.h
index dc4f5950dafa..0cc800299e06 100644
--- a/include/asm-sh/flat.h
+++ b/include/asm-sh/flat.h
@@ -19,6 +19,6 @@
 #define flat_get_addr_from_rp(rp, relval, flags, p)     get_unaligned(rp)
 #define flat_put_addr_at_rp(rp, val, relval)    put_unaligned(val,rp)
 #define flat_get_relocate_addr(rel)             (rel)
-#define flat_set_persistent(relval, p)          0
+#define flat_set_persistent(relval, p)          ({ (void)p; 0; })
 
 #endif /* __ASM_SH_FLAT_H */
diff --git a/include/asm-sh/fpu.h b/include/asm-sh/fpu.h
new file mode 100644
index 000000000000..f8429880a270
--- /dev/null
+++ b/include/asm-sh/fpu.h
@@ -0,0 +1,46 @@
+#ifndef __ASM_SH_FPU_H
+#define __ASM_SH_FPU_H
+
+#define SR_FD    0x00008000
+
+#ifndef __ASSEMBLY__
+#include <asm/ptrace.h>
+
+#ifdef CONFIG_SH_FPU
+static inline void release_fpu(struct pt_regs *regs)
+{
+        regs->sr |= SR_FD;
+}
+
+static inline void grab_fpu(struct pt_regs *regs)
+{
+        regs->sr &= ~SR_FD;
+}
+
+struct task_struct;
+
+extern void save_fpu(struct task_struct *__tsk, struct pt_regs *regs);
+#else
+#define release_fpu(regs)       do { } while (0)
+#define grab_fpu(regs)          do { } while (0)
+#define save_fpu(tsk, regs)     do { } while (0)
+#endif
+
+extern int do_fpu_inst(unsigned short, struct pt_regs *);
+
+#define unlazy_fpu(tsk, regs) do {                      \
+        if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) {   \
+                save_fpu(tsk, regs);                    \
+        }                                               \
+} while (0)
+
+#define clear_fpu(tsk, regs) do {                               \
+        if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) {           \
+                clear_tsk_thread_flag(tsk, TIF_USEDFPU);        \
+                release_fpu(regs);                              \
+        }                                                       \
+} while (0)
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_SH_FPU_H */
diff --git a/include/asm-sh/hd64461.h b/include/asm-sh/hd64461.h
index 342ca55a266a..8c1353baf00f 100644
--- a/include/asm-sh/hd64461.h
+++ b/include/asm-sh/hd64461.h
@@ -46,10 +46,10 @@
 /* CPU Data Bus Control Register */
 #define HD64461_SCPUCR          (CONFIG_HD64461_IOBASE + 0x04)
 
-/* Base Adress Register */
+/* Base Address Register */
 #define HD64461_LCDCBAR         (CONFIG_HD64461_IOBASE + 0x1000)
 
-/* Line increment adress */
+/* Line increment address */
 #define HD64461_LCDCLOR         (CONFIG_HD64461_IOBASE + 0x1002)
 
 /* Controls LCD controller */
@@ -80,9 +80,9 @@
 #define HD64461_LDR3            (CONFIG_HD64461_IOBASE + 0x101e)
 
 /* Palette Registers */
-#define HD64461_CPTWAR          (CONFIG_HD64461_IOBASE + 0x1030)        /* Color Palette Write Adress Register */
+#define HD64461_CPTWAR          (CONFIG_HD64461_IOBASE + 0x1030)        /* Color Palette Write Address Register */
 #define HD64461_CPTWDR          (CONFIG_HD64461_IOBASE + 0x1032)        /* Color Palette Write Data Register */
-#define HD64461_CPTRAR          (CONFIG_HD64461_IOBASE + 0x1034)        /* Color Palette Read Adress Register */
+#define HD64461_CPTRAR          (CONFIG_HD64461_IOBASE + 0x1034)        /* Color Palette Read Address Register */
 #define HD64461_CPTRDR          (CONFIG_HD64461_IOBASE + 0x1036)        /* Color Palette Read Data Register */
 
 #define HD64461_GRDOR           (CONFIG_HD64461_IOBASE + 0x1040)        /* Display Resolution Offset Register */
@@ -97,8 +97,8 @@
 #define HD64461_GRCFGR_COLORDEPTH8      0x01    /* Sets Colordepth 8 for Accelerator */
 
 /* Line Drawing Registers */
-#define HD64461_LNSARH          (CONFIG_HD64461_IOBASE + 0x1046)        /* Line Start Adress Register (H) */
-#define HD64461_LNSARL          (CONFIG_HD64461_IOBASE + 0x1048)        /* Line Start Adress Register (L) */
+#define HD64461_LNSARH          (CONFIG_HD64461_IOBASE + 0x1046)        /* Line Start Address Register (H) */
+#define HD64461_LNSARL          (CONFIG_HD64461_IOBASE + 0x1048)        /* Line Start Address Register (L) */
 #define HD64461_LNAXLR          (CONFIG_HD64461_IOBASE + 0x104a)        /* Axis Pixel Length Register */
 #define HD64461_LNDGR           (CONFIG_HD64461_IOBASE + 0x104c)        /* Diagonal Register */
 #define HD64461_LNAXR           (CONFIG_HD64461_IOBASE + 0x104e)        /* Axial Register */
@@ -106,16 +106,16 @@
 #define HD64461_LNMDR           (CONFIG_HD64461_IOBASE + 0x1052)        /* Line Mode Register */
 
 /* BitBLT Registers */
-#define HD64461_BBTSSARH        (CONFIG_HD64461_IOBASE + 0x1054)        /* Source Start Adress Register (H) */
-#define HD64461_BBTSSARL        (CONFIG_HD64461_IOBASE + 0x1056)        /* Source Start Adress Register (L) */
-#define HD64461_BBTDSARH        (CONFIG_HD64461_IOBASE + 0x1058)        /* Destination Start Adress Register (H) */
-#define HD64461_BBTDSARL        (CONFIG_HD64461_IOBASE + 0x105a)        /* Destination Start Adress Register (L) */
+#define HD64461_BBTSSARH        (CONFIG_HD64461_IOBASE + 0x1054)        /* Source Start Address Register (H) */
+#define HD64461_BBTSSARL        (CONFIG_HD64461_IOBASE + 0x1056)        /* Source Start Address Register (L) */
+#define HD64461_BBTDSARH        (CONFIG_HD64461_IOBASE + 0x1058)        /* Destination Start Address Register (H) */
+#define HD64461_BBTDSARL        (CONFIG_HD64461_IOBASE + 0x105a)        /* Destination Start Address Register (L) */
 #define HD64461_BBTDWR          (CONFIG_HD64461_IOBASE + 0x105c)        /* Destination Block Width Register */
 #define HD64461_BBTDHR          (CONFIG_HD64461_IOBASE + 0x105e)        /* Destination Block Height Register */
-#define HD64461_BBTPARH         (CONFIG_HD64461_IOBASE + 0x1060)        /* Pattern Start Adress Register (H) */
-#define HD64461_BBTPARL         (CONFIG_HD64461_IOBASE + 0x1062)        /* Pattern Start Adress Register (L) */
-#define HD64461_BBTMARH         (CONFIG_HD64461_IOBASE + 0x1064)        /* Mask Start Adress Register (H) */
-#define HD64461_BBTMARL         (CONFIG_HD64461_IOBASE + 0x1066)        /* Mask Start Adress Register (L) */
+#define HD64461_BBTPARH         (CONFIG_HD64461_IOBASE + 0x1060)        /* Pattern Start Address Register (H) */
+#define HD64461_BBTPARL         (CONFIG_HD64461_IOBASE + 0x1062)        /* Pattern Start Address Register (L) */
+#define HD64461_BBTMARH         (CONFIG_HD64461_IOBASE + 0x1064)        /* Mask Start Address Register (H) */
+#define HD64461_BBTMARL         (CONFIG_HD64461_IOBASE + 0x1066)        /* Mask Start Address Register (L) */
 #define HD64461_BBTROPR         (CONFIG_HD64461_IOBASE + 0x1068)        /* ROP Register */
 #define HD64461_BBTMDR          (CONFIG_HD64461_IOBASE + 0x106a)        /* BitBLT Mode Register */
 
diff --git a/include/asm-sh/hs7751rvoip.h b/include/asm-sh/hs7751rvoip.h
deleted file mode 100644
index c4cff9d33927..000000000000
--- a/include/asm-sh/hs7751rvoip.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef __ASM_SH_RENESAS_HS7751RVOIP_H
-#define __ASM_SH_RENESAS_HS7751RVOIP_H
-
-/*
- * linux/include/asm-sh/hs7751rvoip/hs7751rvoip.h
- *
- * Copyright (C) 2000  Atom Create Engineering Co., Ltd.
- *
- * Renesas Technology Sales HS7751RVoIP support
- */
-
-/* Box specific addresses.  */
-
-#define PA_BCR          0xa4000000      /* FPGA */
-#define PA_SLICCNTR1    0xa4000006      /* SLIC PIO Control 1 */
-#define PA_SLICCNTR2    0xa4000008      /* SLIC PIO Control 2 */
-#define PA_DMACNTR      0xa400000a      /* USB DMA Control */
-#define PA_INPORTR      0xa400000c      /* Input Port Register */
-#define PA_OUTPORTR     0xa400000e      /* Output Port Reguster */
-#define PA_VERREG       0xa4000014      /* FPGA Version Register */
-
-#define PA_IDE_OFFSET   0x1f0           /* CF IDE Offset */
-
-#define IRLCNTR1        (PA_BCR + 0)    /* Interrupt Control Register1 */
-#define IRLCNTR2        (PA_BCR + 2)    /* Interrupt Control Register2 */
-#define IRLCNTR3        (PA_BCR + 4)    /* Interrupt Control Register3 */
-#define IRLCNTR4        (PA_BCR + 16)   /* Interrupt Control Register4 */
-#define IRLCNTR5        (PA_BCR + 18)   /* Interrupt Control Register5 */
-
-#define IRQ_PCIETH      6               /* PCI Ethernet IRQ */
-#define IRQ_PCIHUB      7               /* PCI Ethernet Hub IRQ */
-#define IRQ_USBCOM      8               /* USB Comunication IRQ */
-#define IRQ_USBCON      9               /* USB Connect IRQ */
-#define IRQ_USBDMA      10              /* USB DMA IRQ */
-#define IRQ_CFCARD      11              /* CF Card IRQ */
-#define IRQ_PCMCIA      12              /* PCMCIA IRQ */
-#define IRQ_PCISLOT     13              /* PCI Slot #1 IRQ */
-#define IRQ_ONHOOK1     0               /* ON HOOK1 IRQ */
-#define IRQ_OFFHOOK1    1               /* OFF HOOK1 IRQ */
-#define IRQ_ONHOOK2     2               /* ON HOOK2 IRQ */
-#define IRQ_OFFHOOK2    3               /* OFF HOOK2 IRQ */
-#define IRQ_RINGING     4               /* Ringing IRQ */
-#define IRQ_CODEC       5               /* CODEC IRQ */
-
-#define __IO_PREFIX     hs7751rvoip
-#include <asm/io_generic.h>
-
-/* arch/sh/boards/renesas/hs7751rvoip/irq.c */
-void init_hs7751rvoip_IRQ(void);
-
-/* arch/sh/boards/renesas/hs7751rvoip/io.c */
-void *hs7751rvoip_ioremap(unsigned long, unsigned long);
-
-#endif  /* __ASM_SH_RENESAS_HS7751RVOIP */
diff --git a/include/asm-sh/hw_irq.h b/include/asm-sh/hw_irq.h
index cb0b6c9f7020..c958fdaa0095 100644
--- a/include/asm-sh/hw_irq.h
+++ b/include/asm-sh/hw_irq.h
@@ -33,13 +33,6 @@ struct intc_vect {
 #define INTC_VECT(enum_id, vect) { enum_id, vect }
 #define INTC_IRQ(enum_id, irq) INTC_VECT(enum_id, irq2evt(irq))
 
-struct intc_prio {
-        intc_enum enum_id;
-        unsigned char priority;
-};
-
-#define INTC_PRIO(enum_id, prio) { enum_id, prio }
-
 struct intc_group {
         intc_enum enum_id;
         intc_enum enum_ids[32];
@@ -79,8 +72,6 @@ struct intc_desc {
         unsigned int nr_vectors;
         struct intc_group *groups;
         unsigned int nr_groups;
-        struct intc_prio *priorities;
-        unsigned int nr_priorities;
         struct intc_mask_reg *mask_regs;
         unsigned int nr_mask_regs;
         struct intc_prio_reg *prio_regs;
@@ -92,10 +83,9 @@ struct intc_desc {
 
 #define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a)
 #define DECLARE_INTC_DESC(symbol, chipname, vectors, groups,            \
-        priorities, mask_regs, prio_regs, sense_regs)                   \
+        mask_regs, prio_regs, sense_regs)                               \
 struct intc_desc symbol __initdata = {                                  \
         _INTC_ARRAY(vectors), _INTC_ARRAY(groups),                      \
-        _INTC_ARRAY(priorities),                                        \
         _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs),                 \
         _INTC_ARRAY(sense_regs),                                        \
         chipname,                                                       \
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h
index 6ed34d8eac5f..94900c089519 100644
--- a/include/asm-sh/io.h
+++ b/include/asm-sh/io.h
@@ -191,6 +191,8 @@ __BUILD_MEMORY_STRING(w, u16)
 
 #define mmiowb()        wmb()   /* synco on SH-4A, otherwise a nop */
 
+#define IO_SPACE_LIMIT 0xffffffff
+
 /*
  * This function provides a method for the generic case where a board-specific
  * ioport_map simply needs to return the port + some arbitrary port base.
@@ -226,6 +228,11 @@ static inline unsigned int ctrl_inl(unsigned long addr)
         return *(volatile unsigned long*)addr;
 }
 
+static inline unsigned long long ctrl_inq(unsigned long addr)
+{
+        return *(volatile unsigned long long*)addr;
+}
+
 static inline void ctrl_outb(unsigned char b, unsigned long addr)
 {
         *(volatile unsigned char*)addr = b;
@@ -241,49 +248,52 @@ static inline void ctrl_outl(unsigned int b, unsigned long addr)
         *(volatile unsigned long*)addr = b;
 }
 
+static inline void ctrl_outq(unsigned long long b, unsigned long addr)
+{
+        *(volatile unsigned long long*)addr = b;
+}
+
 static inline void ctrl_delay(void)
 {
+#ifdef P2SEG
         ctrl_inw(P2SEG);
+#endif
 }
 
-#define IO_SPACE_LIMIT 0xffffffff
+/* Quad-word real-mode I/O, don't ask.. */
+unsigned long long peek_real_address_q(unsigned long long addr);
+unsigned long long poke_real_address_q(unsigned long long addr,
+                                       unsigned long long val);
 
-#ifdef CONFIG_MMU
-/*
- * Change virtual addresses to physical addresses and vv.
- * These are trivial on the 1:1 Linux/SuperH mapping
- */
-static inline unsigned long virt_to_phys(volatile void *address)
-{
-        return PHYSADDR(address);
-}
+/* arch/sh/mm/ioremap_64.c */
+unsigned long onchip_remap(unsigned long addr, unsigned long size,
+                           const char *name);
+extern void onchip_unmap(unsigned long vaddr);
 
-static inline void *phys_to_virt(unsigned long address)
-{
-        return (void *)P1SEGADDR(address);
-}
-#else
-#define phys_to_virt(address)   ((void *)(address))
+#if !defined(CONFIG_MMU)
 #define virt_to_phys(address)   ((unsigned long)(address))
+#define phys_to_virt(address)   ((void *)(address))
+#else
+#define virt_to_phys(address)   (__pa(address))
+#define phys_to_virt(address)   (__va(address))
 #endif
 
 /*
- * readX/writeX() are used to access memory mapped devices. On some
- * architectures the memory mapped IO stuff needs to be accessed
- * differently. On the x86 architecture, we just read/write the
- * memory location directly.
+ * On 32-bit SH, we traditionally have the whole physical address space
+ * mapped at all times (as MIPS does), so "ioremap()" and "iounmap()" do
+ * not need to do anything but place the address in the proper segment.
+ * This is true for P1 and P2 addresses, as well as some P3 ones.
+ * However, most of the P3 addresses and newer cores using extended
+ * addressing need to map through page tables, so the ioremap()
+ * implementation becomes a bit more complicated.
  *
- * On SH, we traditionally have the whole physical address space mapped
- * at all times (as MIPS does), so "ioremap()" and "iounmap()" do not
- * need to do anything but place the address in the proper segment. This
- * is true for P1 and P2 addresses, as well as some P3 ones. However,
- * most of the P3 addresses and newer cores using extended addressing
- * need to map through page tables, so the ioremap() implementation
- * becomes a bit more complicated. See arch/sh/mm/ioremap.c for
- * additional notes on this.
+ * See arch/sh/mm/ioremap.c for additional notes on this.
  *
  * We cheat a bit and always return uncachable areas until we've fixed
  * the drivers to handle caching properly.
+ *
+ * On the SH-5 the concept of segmentation in the 1:1 PXSEG sense simply
+ * doesn't exist, so everything must go through page tables.
  */
 #ifdef CONFIG_MMU
 void __iomem *__ioremap(unsigned long offset, unsigned long size,
@@ -297,6 +307,7 @@ void __iounmap(void __iomem *addr);
 static inline void __iomem *
 __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)
 {
+#ifdef CONFIG_SUPERH32
         unsigned long last_addr = offset + size - 1;
 
         /*
@@ -311,6 +322,7 @@ __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)
 
                 return (void __iomem *)P2SEGADDR(offset);
         }
+#endif
 
         return __ioremap(offset, size, flags);
 }
diff --git a/include/asm-sh/irqflags.h b/include/asm-sh/irqflags.h
index 9dedc1b693e3..46e71da5be6b 100644
--- a/include/asm-sh/irqflags.h
+++ b/include/asm-sh/irqflags.h
@@ -1,81 +1,11 @@
 #ifndef __ASM_SH_IRQFLAGS_H
 #define __ASM_SH_IRQFLAGS_H
 
-static inline void raw_local_irq_enable(void)
-{
-        unsigned long __dummy0, __dummy1;
-
-        __asm__ __volatile__ (
-                "stc    sr, %0\n\t"
-                "and    %1, %0\n\t"
-#ifdef CONFIG_CPU_HAS_SR_RB
-                "stc    r6_bank, %1\n\t"
-                "or     %1, %0\n\t"
+#ifdef CONFIG_SUPERH32
+#include "irqflags_32.h"
+#else
+#include "irqflags_64.h"
 #endif
-                "ldc    %0, sr\n\t"
-                : "=&r" (__dummy0), "=r" (__dummy1)
-                : "1" (~0x000000f0)
-                : "memory"
-        );
-}
-
-static inline void raw_local_irq_disable(void)
-{
-        unsigned long flags;
-
-        __asm__ __volatile__ (
-                "stc    sr, %0\n\t"
-                "or     #0xf0, %0\n\t"
-                "ldc    %0, sr\n\t"
-                : "=&z" (flags)
-                : /* no inputs */
-                : "memory"
-        );
-}
-
-static inline void set_bl_bit(void)
-{
-        unsigned long __dummy0, __dummy1;
-
-        __asm__ __volatile__ (
-                "stc    sr, %0\n\t"
-                "or     %2, %0\n\t"
-                "and    %3, %0\n\t"
-                "ldc    %0, sr\n\t"
-                : "=&r" (__dummy0), "=r" (__dummy1)
-                : "r" (0x10000000), "r" (0xffffff0f)
-                : "memory"
-        );
-}
-
-static inline void clear_bl_bit(void)
-{
-        unsigned long __dummy0, __dummy1;
-
-        __asm__ __volatile__ (
-                "stc    sr, %0\n\t"
-                "and    %2, %0\n\t"
-                "ldc    %0, sr\n\t"
-                : "=&r" (__dummy0), "=r" (__dummy1)
-                : "1" (~0x10000000)
-                : "memory"
-        );
-}
-
-static inline unsigned long __raw_local_save_flags(void)
-{
-        unsigned long flags;
-
-        __asm__ __volatile__ (
-                "stc    sr, %0\n\t"
-                "and    #0xf0, %0\n\t"
-                : "=&z" (flags)
-                : /* no inputs */
-                : "memory"
-        );
-
-        return flags;
-}
 
 #define raw_local_save_flags(flags) \
                 do { (flags) = __raw_local_save_flags(); } while (0)
@@ -92,25 +22,6 @@ static inline int raw_irqs_disabled(void)
         return raw_irqs_disabled_flags(flags);
 }
 
-static inline unsigned long __raw_local_irq_save(void)
-{
-        unsigned long flags, __dummy;
-
-        __asm__ __volatile__ (
-                "stc    sr, %1\n\t"
-                "mov    %1, %0\n\t"
-                "or     #0xf0, %0\n\t"
-                "ldc    %0, sr\n\t"
-                "mov    %1, %0\n\t"
-                "and    #0xf0, %0\n\t"
-                : "=&z" (flags), "=&r" (__dummy)
-                : /* no inputs */
-                : "memory"
-        );
-
-        return flags;
-}
-
 #define raw_local_irq_save(flags) \
                 do { (flags) = __raw_local_irq_save(); } while (0)
 
diff --git a/include/asm-sh/irqflags_32.h b/include/asm-sh/irqflags_32.h
new file mode 100644
index 000000000000..60218f541340
--- /dev/null
+++ b/include/asm-sh/irqflags_32.h
@@ -0,0 +1,99 @@
+#ifndef __ASM_SH_IRQFLAGS_32_H
+#define __ASM_SH_IRQFLAGS_32_H
+
+static inline void raw_local_irq_enable(void)
+{
+        unsigned long __dummy0, __dummy1;
+
+        __asm__ __volatile__ (
+                "stc    sr, %0\n\t"
+                "and    %1, %0\n\t"
+#ifdef CONFIG_CPU_HAS_SR_RB
+                "stc    r6_bank, %1\n\t"
+                "or     %1, %0\n\t"
+#endif
+                "ldc    %0, sr\n\t"
+                : "=&r" (__dummy0), "=r" (__dummy1)
+                : "1" (~0x000000f0)
+                : "memory"
+        );
+}
+
+static inline void raw_local_irq_disable(void)
+{
+        unsigned long flags;
+
+        __asm__ __volatile__ (
+                "stc    sr, %0\n\t"
+                "or     #0xf0, %0\n\t"
+                "ldc    %0, sr\n\t"
+                : "=&z" (flags)
+                : /* no inputs */
+                : "memory"
+        );
+}
+
+static inline void set_bl_bit(void)
+{
+        unsigned long __dummy0, __dummy1;
+
+        __asm__ __volatile__ (
+                "stc    sr, %0\n\t"
+                "or     %2, %0\n\t"
+                "and    %3, %0\n\t"
+                "ldc    %0, sr\n\t"
+                : "=&r" (__dummy0), "=r" (__dummy1)
+                : "r" (0x10000000), "r" (0xffffff0f)
+                : "memory"
+        );
+}
+
+static inline void clear_bl_bit(void)
+{
+        unsigned long __dummy0, __dummy1;
+
+        __asm__ __volatile__ (
+                "stc    sr, %0\n\t"
+                "and    %2, %0\n\t"
+                "ldc    %0, sr\n\t"
+                : "=&r" (__dummy0), "=r" (__dummy1)
+                : "1" (~0x10000000)
+                : "memory"
+        );
+}
+
+static inline unsigned long __raw_local_save_flags(void)
+{
+        unsigned long flags;
+
+        __asm__ __volatile__ (
+                "stc    sr, %0\n\t"
+                "and    #0xf0, %0\n\t"
+                : "=&z" (flags)
+                : /* no inputs */
+                : "memory"
+        );
+
+        return flags;
+}
+
+static inline unsigned long __raw_local_irq_save(void)
+{
+        unsigned long flags, __dummy;
+
+        __asm__ __volatile__ (
+                "stc    sr, %1\n\t"
+                "mov    %1, %0\n\t"
+                "or     #0xf0, %0\n\t"
+                "ldc    %0, sr\n\t"
+                "mov    %1, %0\n\t"
+                "and    #0xf0, %0\n\t"
+                : "=&z" (flags), "=&r" (__dummy)
+                : /* no inputs */
+                : "memory"
+        );
+
+        return flags;
+}
+
+#endif /* __ASM_SH_IRQFLAGS_32_H */
diff --git a/include/asm-sh/irqflags_64.h b/include/asm-sh/irqflags_64.h
new file mode 100644
index 000000000000..4f6b8a56e7bd
--- /dev/null
+++ b/include/asm-sh/irqflags_64.h
@@ -0,0 +1,85 @@
+#ifndef __ASM_SH_IRQFLAGS_64_H
+#define __ASM_SH_IRQFLAGS_64_H
+
+#include <asm/cpu/registers.h>
+
+#define SR_MASK_LL      0x00000000000000f0LL
+#define SR_BL_LL        0x0000000010000000LL
+
+static inline void raw_local_irq_enable(void)
+{
+        unsigned long long __dummy0, __dummy1 = ~SR_MASK_LL;
+
+        __asm__ __volatile__("getcon    " __SR ", %0\n\t"
+                             "and       %0, %1, %0\n\t"
+                             "putcon    %0, " __SR "\n\t"
+                             : "=&r" (__dummy0)
+                             : "r" (__dummy1));
+}
+
+static inline void raw_local_irq_disable(void)
+{
+        unsigned long long __dummy0, __dummy1 = SR_MASK_LL;
+
+        __asm__ __volatile__("getcon    " __SR ", %0\n\t"
+                             "or        %0, %1, %0\n\t"
+                             "putcon    %0, " __SR "\n\t"
+                             : "=&r" (__dummy0)
+                             : "r" (__dummy1));
+}
+
+static inline void set_bl_bit(void)
+{
+        unsigned long long __dummy0, __dummy1 = SR_BL_LL;
+
+        __asm__ __volatile__("getcon    " __SR ", %0\n\t"
+                             "or        %0, %1, %0\n\t"
+                             "putcon    %0, " __SR "\n\t"
+                             : "=&r" (__dummy0)
+                             : "r" (__dummy1));
+
+}
+
+static inline void clear_bl_bit(void)
+{
+        unsigned long long __dummy0, __dummy1 = ~SR_BL_LL;
+
+        __asm__ __volatile__("getcon    " __SR ", %0\n\t"
+                             "and       %0, %1, %0\n\t"
+                             "putcon    %0, " __SR "\n\t"
+                             : "=&r" (__dummy0)
+                             : "r" (__dummy1));
+}
+
+static inline unsigned long __raw_local_save_flags(void)
+{
+        unsigned long long __dummy = SR_MASK_LL;
+        unsigned long flags;
+
+        __asm__ __volatile__ (
+                "getcon " __SR ", %0\n\t"
+                "and    %0, %1, %0"
+                : "=&r" (flags)
+                : "r" (__dummy));
+
+        return flags;
+}
+
+static inline unsigned long __raw_local_irq_save(void)
+{
+        unsigned long long __dummy0, __dummy1 = SR_MASK_LL;
+        unsigned long flags;
+
+        __asm__ __volatile__ (
+                "getcon " __SR ", %1\n\t"
+                "or     %1, r63, %0\n\t"
+                "or     %1, %2, %1\n\t"
+                "putcon %1, " __SR "\n\t"
+                "and    %0, %2, %0"
+                : "=&r" (flags), "=&r" (__dummy0)
+                : "r" (__dummy1));
+
+        return flags;
+}
+
+#endif /* __ASM_SH_IRQFLAGS_64_H */
diff --git a/include/asm-sh/machvec.h b/include/asm-sh/machvec.h
index 088698bacf2f..ddb18ad23303 100644
--- a/include/asm-sh/machvec.h
+++ b/include/asm-sh/machvec.h
@@ -56,9 +56,6 @@ struct sh_machine_vector {
 
         void (*mv_heartbeat)(void);
 
-        void *(*mv_consistent_alloc)(struct device *, size_t, dma_addr_t *, gfp_t);
-        int (*mv_consistent_free)(struct device *, size_t, void *, dma_addr_t);
-
         void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
         void (*mv_ioport_unmap)(void __iomem *);
 };
diff --git a/include/asm-sh/microdev.h b/include/asm-sh/microdev.h
index 018332a9e590..1aed15856e11 100644
--- a/include/asm-sh/microdev.h
+++ b/include/asm-sh/microdev.h
@@ -17,7 +17,7 @@ extern void microdev_print_fpga_intc_status(void);
 /*
  * The following are useful macros for manipulating the interrupt
  * controller (INTC) on the CPU-board FPGA.  should be noted that there
- * is an INTC on the FPGA, and a seperate INTC on the SH4-202 core -
+ * is an INTC on the FPGA, and a separate INTC on the SH4-202 core -
  * these are two different things, both of which need to be prorammed to
  * correctly route - unfortunately, they have the same name and
  * abbreviations!
@@ -25,7 +25,7 @@ extern void microdev_print_fpga_intc_status(void);
 #define MICRODEV_FPGA_INTC_BASE         0xa6110000ul                            /* INTC base address on CPU-board FPGA */
 #define MICRODEV_FPGA_INTENB_REG        (MICRODEV_FPGA_INTC_BASE+0ul)           /* Interrupt Enable Register on INTC on CPU-board FPGA */
 #define MICRODEV_FPGA_INTDSB_REG        (MICRODEV_FPGA_INTC_BASE+8ul)           /* Interrupt Disable Register on INTC on CPU-board FPGA */
-#define MICRODEV_FPGA_INTC_MASK(n)      (1ul<<(n))                              /* Interupt mask to enable/disable INTC in CPU-board FPGA */
+#define MICRODEV_FPGA_INTC_MASK(n)      (1ul<<(n))                              /* Interrupt mask to enable/disable INTC in CPU-board FPGA */
 #define MICRODEV_FPGA_INTPRI_REG(n)     (MICRODEV_FPGA_INTC_BASE+0x10+((n)/8)*8)/* Interrupt Priority Register on INTC on CPU-board FPGA */
 #define MICRODEV_FPGA_INTPRI_LEVEL(n,x) ((x)<<(((n)%8)*4))                      /* MICRODEV_FPGA_INTPRI_LEVEL(int_number, int_level) */
 #define MICRODEV_FPGA_INTPRI_MASK(n)    (MICRODEV_FPGA_INTPRI_LEVEL((n),0xful)) /* Interrupt Priority Mask on INTC on CPU-board FPGA */
diff --git a/include/asm-sh/mmu_context.h b/include/asm-sh/mmu_context.h
index 199662bb35c6..fe58d00b250c 100644
--- a/include/asm-sh/mmu_context.h
+++ b/include/asm-sh/mmu_context.h
@@ -1,13 +1,13 @@
 /*
  * Copyright (C) 1999 Niibe Yutaka
- * Copyright (C) 2003 - 2006 Paul Mundt
+ * Copyright (C) 2003 - 2007 Paul Mundt
  *
  * ASID handling idea taken from MIPS implementation.
  */
 #ifndef __ASM_SH_MMU_CONTEXT_H
 #define __ASM_SH_MMU_CONTEXT_H
-#ifdef __KERNEL__
 
+#ifdef __KERNEL__
 #include <asm/cpu/mmu_context.h>
 #include <asm/tlbflush.h>
 #include <asm/uaccess.h>
@@ -19,7 +19,6 @@
  *    (a) TLB cache version (or round, cycle whatever expression you like)
  *    (b) ASID (Address Space IDentifier)
  */
-
 #define MMU_CONTEXT_ASID_MASK           0x000000ff
 #define MMU_CONTEXT_VERSION_MASK        0xffffff00
 #define MMU_CONTEXT_FIRST_VERSION       0x00000100
@@ -28,10 +27,11 @@
 /* ASID is 8-bit value, so it can't be 0x100 */
 #define MMU_NO_ASID                     0x100
 
-#define cpu_context(cpu, mm)    ((mm)->context.id[cpu])
-#define cpu_asid(cpu, mm)       (cpu_context((cpu), (mm)) & \
-                                 MMU_CONTEXT_ASID_MASK)
 #define asid_cache(cpu)         (cpu_data[cpu].asid_cache)
+#define cpu_context(cpu, mm)    ((mm)->context.id[cpu])
+
+#define cpu_asid(cpu, mm)       \
+        (cpu_context((cpu), (mm)) & MMU_CONTEXT_ASID_MASK)
 
 /*
  * Virtual Page Number mask
@@ -39,6 +39,12 @@
 #define MMU_VPN_MASK    0xfffff000
 
 #ifdef CONFIG_MMU
+#if defined(CONFIG_SUPERH32)
+#include "mmu_context_32.h"
+#else
+#include "mmu_context_64.h"
+#endif
+
 /*
  * Get MMU context if needed.
  */
@@ -59,6 +65,14 @@ static inline void get_mmu_context(struct mm_struct *mm, unsigned int cpu)
                  */
                 flush_tlb_all();
 
+#ifdef CONFIG_SUPERH64
+                /*
+                 * The SH-5 cache uses the ASIDs, requiring both the I and D
+                 * cache to be flushed when the ASID is exhausted. Weak.
+                 */
+                flush_cache_all();
+#endif
+
                 /*
                  * Fix version; Note that we avoid version #0
                  * to distingush NO_CONTEXT.
@@ -86,39 +100,6 @@ static inline int init_new_context(struct task_struct *tsk,
 }
 
 /*
- * Destroy context related info for an mm_struct that is about
- * to be put to rest.
- */
-static inline void destroy_context(struct mm_struct *mm)
-{
-        /* Do nothing */
-}
-
-static inline void set_asid(unsigned long asid)
-{
-        unsigned long __dummy;
-
-        __asm__ __volatile__ ("mov.l    %2, %0\n\t"
-                              "and      %3, %0\n\t"
-                              "or       %1, %0\n\t"
-                              "mov.l    %0, %2"
-                              : "=&r" (__dummy)
-                              : "r" (asid), "m" (__m(MMU_PTEH)),
-                                "r" (0xffffff00));
-}
-
-static inline unsigned long get_asid(void)
-{
-        unsigned long asid;
-
-        __asm__ __volatile__ ("mov.l    %1, %0"
-                              : "=r" (asid)
-                              : "m" (__m(MMU_PTEH)));
-        asid &= MMU_CONTEXT_ASID_MASK;
-        return asid;
-}
-
-/*
  * After we have set current->mm to a new value, this activates
  * the context for the new mm so we see the new mappings.
  */
@@ -128,17 +109,6 @@ static inline void activate_context(struct mm_struct *mm, unsigned int cpu)
         set_asid(cpu_asid(cpu, mm));
 }
 
-/* MMU_TTB is used for optimizing the fault handling. */
-static inline void set_TTB(pgd_t *pgd)
-{
-        ctrl_outl((unsigned long)pgd, MMU_TTB);
-}
-
-static inline pgd_t *get_TTB(void)
-{
-        return (pgd_t *)ctrl_inl(MMU_TTB);
-}
-
 static inline void switch_mm(struct mm_struct *prev,
                              struct mm_struct *next,
                              struct task_struct *tsk)
@@ -153,17 +123,7 @@ static inline void switch_mm(struct mm_struct *prev,
                 if (!cpu_test_and_set(cpu, next->cpu_vm_mask))
                         activate_context(next, cpu);
 }
-
-#define deactivate_mm(tsk,mm)   do { } while (0)
-
-#define activate_mm(prev, next) \
-        switch_mm((prev),(next),NULL)
-
-static inline void
-enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
-{
-}
-#else /* !CONFIG_MMU */
+#else
 #define get_mmu_context(mm)             do { } while (0)
 #define init_new_context(tsk,mm)        (0)
 #define destroy_context(mm)             do { } while (0)
@@ -173,10 +133,11 @@ enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
 #define get_TTB()                       (0)
 #define activate_context(mm,cpu)        do { } while (0)
 #define switch_mm(prev,next,tsk)        do { } while (0)
+#endif /* CONFIG_MMU */
+
+#define activate_mm(prev, next)         switch_mm((prev),(next),NULL)
 #define deactivate_mm(tsk,mm)           do { } while (0)
-#define activate_mm(prev,next)          do { } while (0)
 #define enter_lazy_tlb(mm,tsk)          do { } while (0)
-#endif /* CONFIG_MMU */
 
 #if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4)
 /*
diff --git a/include/asm-sh/mmu_context_32.h b/include/asm-sh/mmu_context_32.h
new file mode 100644
index 000000000000..f4f9aebd68b7
--- /dev/null
+++ b/include/asm-sh/mmu_context_32.h
@@ -0,0 +1,47 @@
+#ifndef __ASM_SH_MMU_CONTEXT_32_H
+#define __ASM_SH_MMU_CONTEXT_32_H
+
+/*
+ * Destroy context related info for an mm_struct that is about
+ * to be put to rest.
+ */
+static inline void destroy_context(struct mm_struct *mm)
+{
+        /* Do nothing */
+}
+
+static inline void set_asid(unsigned long asid)
+{
+        unsigned long __dummy;
+
+        __asm__ __volatile__ ("mov.l    %2, %0\n\t"
+                              "and      %3, %0\n\t"
+                              "or       %1, %0\n\t"
+                              "mov.l    %0, %2"
+                              : "=&r" (__dummy)
+                              : "r" (asid), "m" (__m(MMU_PTEH)),
+                                "r" (0xffffff00));
+}
+
+static inline unsigned long get_asid(void)
+{
+        unsigned long asid;
+
+        __asm__ __volatile__ ("mov.l    %1, %0"
+                              : "=r" (asid)
+                              : "m" (__m(MMU_PTEH)));
+        asid &= MMU_CONTEXT_ASID_MASK;
+        return asid;
+}
+
+/* MMU_TTB is used for optimizing the fault handling. */
+static inline void set_TTB(pgd_t *pgd)
+{
+        ctrl_outl((unsigned long)pgd, MMU_TTB);
+}
+
+static inline pgd_t *get_TTB(void)
+{
+        return (pgd_t *)ctrl_inl(MMU_TTB);
+}
+#endif /* __ASM_SH_MMU_CONTEXT_32_H */
diff --git a/include/asm-sh/mmu_context_64.h b/include/asm-sh/mmu_context_64.h
new file mode 100644
index 000000000000..020be744b088
--- /dev/null
+++ b/include/asm-sh/mmu_context_64.h
@@ -0,0 +1,75 @@
+#ifndef __ASM_SH_MMU_CONTEXT_64_H
+#define __ASM_SH_MMU_CONTEXT_64_H
+
+/*
+ * sh64-specific mmu_context interface.
+ *
+ * Copyright (C) 2000, 2001  Paolo Alberelli
+ * Copyright (C) 2003 - 2007  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <asm/cpu/registers.h>
+#include <asm/cacheflush.h>
+
+#define SR_ASID_MASK            0xffffffffff00ffffULL
+#define SR_ASID_SHIFT           16
+
+/*
+ * Destroy context related info for an mm_struct that is about
+ * to be put to rest.
+ */
+static inline void destroy_context(struct mm_struct *mm)
+{
+        /* Well, at least free TLB entries */
+        flush_tlb_mm(mm);
+}
+
+static inline unsigned long get_asid(void)
+{
+        unsigned long long sr;
+
+        asm volatile ("getcon   " __SR ", %0\n\t"
+                      : "=r" (sr));
+
+        sr = (sr >> SR_ASID_SHIFT) & MMU_CONTEXT_ASID_MASK;
+        return (unsigned long) sr;
+}
+
+/* Set ASID into SR */
+static inline void set_asid(unsigned long asid)
+{
+        unsigned long long sr, pc;
+
+        asm volatile ("getcon   " __SR ", %0" : "=r" (sr));
+
+        sr = (sr & SR_ASID_MASK) | (asid << SR_ASID_SHIFT);
+
+        /*
+         * It is possible that this function may be inlined and so to avoid
+         * the assembler reporting duplicate symbols we make use of the
+         * gas trick of generating symbols using numerics and forward
+         * reference.
+         */
+        asm volatile ("movi     1, %1\n\t"
+                      "shlli    %1, 28, %1\n\t"
+                      "or       %0, %1, %1\n\t"
+                      "putcon   %1, " __SR "\n\t"
+                      "putcon   %0, " __SSR "\n\t"
+                      "movi     1f, %1\n\t"
+                      "ori      %1, 1 , %1\n\t"
+                      "putcon   %1, " __SPC "\n\t"
+                      "rte\n"
+                      "1:\n\t"
+                      : "=r" (sr), "=r" (pc) : "0" (sr));
+}
+
+/* No spare register to twiddle, so use a software cache */
+extern pgd_t *mmu_pdtp_cache;
+
+#define set_TTB(pgd)    (mmu_pdtp_cache = (pgd))
+#define get_TTB()       (mmu_pdtp_cache)
+
+#endif /* __ASM_SH_MMU_CONTEXT_64_H */
diff --git a/include/asm-sh/module.h b/include/asm-sh/module.h
index 118d5a2b228f..46eccd331660 100644
--- a/include/asm-sh/module.h
+++ b/include/asm-sh/module.h
@@ -20,6 +20,8 @@ struct mod_arch_specific {
 #  define MODULE_PROC_FAMILY "SH3LE "
 # elif defined  CONFIG_CPU_SH4
 #  define MODULE_PROC_FAMILY "SH4LE "
+# elif defined  CONFIG_CPU_SH5
+#  define MODULE_PROC_FAMILY "SH5LE "
 # else
 #  error unknown processor family
 # endif
@@ -30,6 +32,8 @@ struct mod_arch_specific {
 #  define MODULE_PROC_FAMILY "SH3BE "
 # elif defined  CONFIG_CPU_SH4
 #  define MODULE_PROC_FAMILY "SH4BE "
+# elif defined  CONFIG_CPU_SH5
+#  define MODULE_PROC_FAMILY "SH5BE "
 # else
 #  error unknown processor family
 # endif
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h
index d00a8fde7c7f..002e64a4f049 100644
--- a/include/asm-sh/page.h
+++ b/include/asm-sh/page.h
@@ -5,13 +5,7 @@
  * Copyright (C) 1999  Niibe Yutaka
  */
 
-/*
-   [ P0/U0 (virtual) ]          0x00000000     <------ User space
-   [ P1 (fixed)   cached ]      0x80000000     <------ Kernel space
-   [ P2 (fixed)  non-cachable]  0xA0000000     <------ Physical access
-   [ P3 (virtual) cached]       0xC0000000     <------ vmalloced area
-   [ P4 control   ]             0xE0000000
- */
+#include <linux/const.h>
 
 #ifdef __KERNEL__
 
@@ -26,15 +20,13 @@
 # error "Bogus kernel page size?"
 #endif
 
-#ifdef __ASSEMBLY__
-#define PAGE_SIZE       (1 << PAGE_SHIFT)
-#else
-#define PAGE_SIZE       (1UL << PAGE_SHIFT)
-#endif
-
+#define PAGE_SIZE       (_AC(1, UL) << PAGE_SHIFT)
 #define PAGE_MASK       (~(PAGE_SIZE-1))
 #define PTE_MASK        PAGE_MASK
 
+/* to align the pointer to the (next) page boundary */
+#define PAGE_ALIGN(addr)        (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+
 #if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
 #define HPAGE_SHIFT     16
 #elif defined(CONFIG_HUGETLB_PAGE_SIZE_256K)
@@ -45,6 +37,8 @@
 #define HPAGE_SHIFT     22
 #elif defined(CONFIG_HUGETLB_PAGE_SIZE_64MB)
 #define HPAGE_SHIFT     26
+#elif defined(CONFIG_HUGETLB_PAGE_SIZE_512MB)
+#define HPAGE_SHIFT     29
 #endif
 
 #ifdef CONFIG_HUGETLB_PAGE
@@ -55,20 +49,12 @@
 
 #ifndef __ASSEMBLY__
 
-extern void (*clear_page)(void *to);
-extern void (*copy_page)(void *to, void *from);
-
 extern unsigned long shm_align_mask;
 extern unsigned long max_low_pfn, min_low_pfn;
 extern unsigned long memory_start, memory_end;
 
-#ifdef CONFIG_MMU
-extern void clear_page_slow(void *to);
-extern void copy_page_slow(void *to, void *from);
-#else
-extern void clear_page_nommu(void *to);
-extern void copy_page_nommu(void *to, void *from);
-#endif
+extern void clear_page(void *to);
+extern void copy_page(void *to, void *from);
 
 #if !defined(CONFIG_CACHE_OFF) && defined(CONFIG_MMU) && \
         (defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB))
@@ -96,12 +82,18 @@ typedef struct { unsigned long long pgd; } pgd_t;
         ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
 #define __pte(x) \
         ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
-#else
+#elif defined(CONFIG_SUPERH32)
 typedef struct { unsigned long pte_low; } pte_t;
 typedef struct { unsigned long pgprot; } pgprot_t;
 typedef struct { unsigned long pgd; } pgd_t;
 #define pte_val(x)      ((x).pte_low)
-#define __pte(x) ((pte_t) { (x) } )
+#define __pte(x)        ((pte_t) { (x) } )
+#else
+typedef struct { unsigned long long pte_low; } pte_t;
+typedef struct { unsigned long pgprot; } pgprot_t;
+typedef struct { unsigned long pgd; } pgd_t;
+#define pte_val(x)      ((x).pte_low)
+#define __pte(x)        ((pte_t) { (x) } )
 #endif
 
 #define pgd_val(x)      ((x).pgd)
@@ -112,28 +104,44 @@ typedef struct { unsigned long pgd; } pgd_t;
 
 #endif /* !__ASSEMBLY__ */
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)        (((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 /*
- * IF YOU CHANGE THIS, PLEASE ALSO CHANGE
- *
- *      arch/sh/kernel/vmlinux.lds.S
- *
- * which has the same constant encoded..
+ * __MEMORY_START and SIZE are the physical addresses and size of RAM.
  */
-
 #define __MEMORY_START          CONFIG_MEMORY_START
 #define __MEMORY_SIZE           CONFIG_MEMORY_SIZE
 
+/*
+ * PAGE_OFFSET is the virtual address of the start of kernel address
+ * space.
+ */
 #define PAGE_OFFSET             CONFIG_PAGE_OFFSET
-#define __pa(x)                 ((unsigned long)(x)-PAGE_OFFSET)
-#define __va(x)                 ((void *)((unsigned long)(x)+PAGE_OFFSET))
-#define pfn_to_kaddr(pfn)       __va((pfn) << PAGE_SHIFT)
 
+/*
+ * Virtual to physical RAM address translation.
+ *
+ * In 29 bit mode, the physical offset of RAM from address 0 is visible in
+ * the kernel virtual address space, and thus we don't have to take
+ * this into account when translating. However in 32 bit mode this offset
+ * is not visible (it is part of the PMB mapping) and so needs to be
+ * added or subtracted as required.
+ */
+#ifdef CONFIG_32BIT
+#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET+__MEMORY_START)
+#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET-__MEMORY_START))
+#else
+#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET)
+#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
+#endif
+
+#define pfn_to_kaddr(pfn)       __va((pfn) << PAGE_SHIFT)
 #define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
 
-/* PFN start number, because of __MEMORY_START */
+/*
+ * PFN = physical frame number (ie PFN 0 == physical address 0)
+ * PFN_START is the PFN of the first page of RAM. By defining this we
+ * don't have struct page entries for the portion of address space
+ * between physical address 0 and the start of RAM.
+ */
 #define PFN_START               (__MEMORY_START >> PAGE_SHIFT)
 #define ARCH_PFN_OFFSET         (PFN_START)
 #define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
@@ -154,11 +162,21 @@ typedef struct { unsigned long pgd; } pgd_t;
 #endif
 
 /*
- * Slub defaults to 8-byte alignment, we're only interested in 4.
- * Slab defaults to BYTES_PER_WORD, which ends up being the same anyways.
+ * Some drivers need to perform DMA into kmalloc'ed buffers
+ * and so we have to increase the kmalloc minalign for this.
  */
-#define ARCH_KMALLOC_MINALIGN   4
-#define ARCH_SLAB_MINALIGN      4
+#define ARCH_KMALLOC_MINALIGN   L1_CACHE_BYTES
+
+#ifdef CONFIG_SUPERH64
+/*
+ * While BYTES_PER_WORD == 4 on the current sh64 ABI, GCC will still
+ * happily generate {ld/st}.q pairs, requiring us to have 8-byte
+ * alignment to avoid traps. The kmalloc alignment is gauranteed by
+ * virtue of L1_CACHE_BYTES, requiring this to only be special cased
+ * for slab caches.
+ */
+#define ARCH_SLAB_MINALIGN      8
+#endif
 
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_PAGE_H */
diff --git a/include/asm-sh/param.h b/include/asm-sh/param.h
index 1012296e07ab..ae245afdfd6a 100644
--- a/include/asm-sh/param.h
+++ b/include/asm-sh/param.h
@@ -2,11 +2,7 @@
 #define __ASM_SH_PARAM_H
 
 #ifdef __KERNEL__
-# ifdef CONFIG_SH_WDT
-#  define HZ            1000            /* Needed for high-res WOVF */
-# else
-#  define HZ            CONFIG_HZ
-# endif
+# define HZ             CONFIG_HZ
 # define USER_HZ        100             /* User interfaces are in "ticks" */
 # define CLOCKS_PER_SEC (USER_HZ)       /* frequency at which times() counts */
 #endif
diff --git a/include/asm-sh/pci.h b/include/asm-sh/pci.h
index 2757ce096ff7..df1d383e18a5 100644
--- a/include/asm-sh/pci.h
+++ b/include/asm-sh/pci.h
@@ -38,9 +38,12 @@ extern struct pci_channel board_pci_channels[];
 #if defined(CONFIG_CPU_SUBTYPE_SH7780) || defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define PCI_IO_AREA             0xFE400000
 #define PCI_IO_SIZE             0x00400000
+#elif defined(CONFIG_CPU_SH5)
+extern unsigned long PCI_IO_AREA;
+#define PCI_IO_SIZE             0x00010000
 #else
 #define PCI_IO_AREA             0xFE240000
-#define PCI_IO_SIZE             0X00040000
+#define PCI_IO_SIZE             0x00040000
 #endif
 
 #define PCI_MEM_SIZE            0x01000000
diff --git a/include/asm-sh/pgtable.h b/include/asm-sh/pgtable.h
index 8f1e8be8d15d..a4a8f8b93463 100644
--- a/include/asm-sh/pgtable.h
+++ b/include/asm-sh/pgtable.h
@@ -3,7 +3,7 @@
  * use the SuperH page table tree.
  *
  * Copyright (C) 1999 Niibe Yutaka
- * Copyright (C) 2002 - 2005 Paul Mundt
+ * Copyright (C) 2002 - 2007 Paul Mundt
  *
  * This file is subject to the terms and conditions of the GNU General
  * Public License.  See the file "COPYING" in the main directory of this
@@ -29,10 +29,27 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 #endif /* !__ASSEMBLY__ */
 
 /*
+ * Effective and physical address definitions, to aid with sign
+ * extension.
+ */
+#define NEFF            32
+#define NEFF_SIGN       (1LL << (NEFF - 1))
+#define NEFF_MASK       (-1LL << NEFF)
+
+#ifdef CONFIG_29BIT
+#define NPHYS           29
+#else
+#define NPHYS           32
+#endif
+
+#define NPHYS_SIGN      (1LL << (NPHYS - 1))
+#define NPHYS_MASK      (-1LL << NPHYS)
+
+/*
  * traditional two-level paging structure
  */
 /* PTE bits */
-#ifdef CONFIG_X2TLB
+#if defined(CONFIG_X2TLB) || defined(CONFIG_SUPERH64)
 # define PTE_MAGNITUDE  3       /* 64-bit PTEs on extended mode SH-X2 TLB */
 #else
 # define PTE_MAGNITUDE  2       /* 32-bit PTEs */
@@ -52,283 +69,27 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 #define USER_PTRS_PER_PGD       (TASK_SIZE/PGDIR_SIZE)
 #define FIRST_USER_ADDRESS      0
 
-#define PTE_PHYS_MASK           (0x20000000 - PAGE_SIZE)
-
-#define VMALLOC_START   (P3SEG)
-#define VMALLOC_END     (FIXADDR_START-2*PAGE_SIZE)
-
-/*
- * Linux PTEL encoding.
- *
- * Hardware and software bit definitions for the PTEL value (see below for
- * notes on SH-X2 MMUs and 64-bit PTEs):
- *
- * - Bits 0 and 7 are reserved on SH-3 (_PAGE_WT and _PAGE_SZ1 on SH-4).
- *
- * - Bit 1 is the SH-bit, but is unused on SH-3 due to an MMU bug (the
- *   hardware PTEL value can't have the SH-bit set when MMUCR.IX is set,
- *   which is the default in cpu-sh3/mmu_context.h:MMU_CONTROL_INIT).
- *
- *   In order to keep this relatively clean, do not use these for defining
- *   SH-3 specific flags until all of the other unused bits have been
- *   exhausted.
- *
- * - Bit 9 is reserved by everyone and used by _PAGE_PROTNONE.
- *
- * - Bits 10 and 11 are low bits of the PPN that are reserved on >= 4K pages.
- *   Bit 10 is used for _PAGE_ACCESSED, bit 11 remains unused.
- *
- * - Bits 31, 30, and 29 remain unused by everyone and can be used for future
- *   software flags, although care must be taken to update _PAGE_CLEAR_FLAGS.
- *
- * XXX: Leave the _PAGE_FILE and _PAGE_WT overhaul for a rainy day.
- *
- * SH-X2 MMUs and extended PTEs
- *
- * SH-X2 supports an extended mode TLB with split data arrays due to the
- * number of bits needed for PR and SZ (now EPR and ESZ) encodings. The PR and
- * SZ bit placeholders still exist in data array 1, but are implemented as
- * reserved bits, with the real logic existing in data array 2.
- *
- * The downside to this is that we can no longer fit everything in to a 32-bit
- * PTE encoding, so a 64-bit pte_t is necessary for these parts. On the plus
- * side, this gives us quite a few spare bits to play with for future usage.
- */
-/* Legacy and compat mode bits */
-#define _PAGE_WT        0x001           /* WT-bit on SH-4, 0 on SH-3 */
-#define _PAGE_HW_SHARED 0x002           /* SH-bit  : shared among processes */
-#define _PAGE_DIRTY     0x004           /* D-bit   : page changed */
-#define _PAGE_CACHABLE  0x008           /* C-bit   : cachable */
-#define _PAGE_SZ0       0x010           /* SZ0-bit : Size of page */
-#define _PAGE_RW        0x020           /* PR0-bit : write access allowed */
-#define _PAGE_USER      0x040           /* PR1-bit : user space access allowed*/
-#define _PAGE_SZ1       0x080           /* SZ1-bit : Size of page (on SH-4) */
-#define _PAGE_PRESENT   0x100           /* V-bit   : page is valid */
-#define _PAGE_PROTNONE  0x200           /* software: if not present  */
-#define _PAGE_ACCESSED  0x400           /* software: page referenced */
-#define _PAGE_FILE      _PAGE_WT        /* software: pagecache or swap? */
-
-#define _PAGE_SZ_MASK   (_PAGE_SZ0 | _PAGE_SZ1)
-#define _PAGE_PR_MASK   (_PAGE_RW | _PAGE_USER)
-
-/* Extended mode bits */
-#define _PAGE_EXT_ESZ0          0x0010  /* ESZ0-bit: Size of page */
-#define _PAGE_EXT_ESZ1          0x0020  /* ESZ1-bit: Size of page */
-#define _PAGE_EXT_ESZ2          0x0040  /* ESZ2-bit: Size of page */
-#define _PAGE_EXT_ESZ3          0x0080  /* ESZ3-bit: Size of page */
-
-#define _PAGE_EXT_USER_EXEC     0x0100  /* EPR0-bit: User space executable */
-#define _PAGE_EXT_USER_WRITE    0x0200  /* EPR1-bit: User space writable */
-#define _PAGE_EXT_USER_READ     0x0400  /* EPR2-bit: User space readable */
-
-#define _PAGE_EXT_KERN_EXEC     0x0800  /* EPR3-bit: Kernel space executable */
-#define _PAGE_EXT_KERN_WRITE    0x1000  /* EPR4-bit: Kernel space writable */
-#define _PAGE_EXT_KERN_READ     0x2000  /* EPR5-bit: Kernel space readable */
-
-/* Wrapper for extended mode pgprot twiddling */
-#define _PAGE_EXT(x)            ((unsigned long long)(x) << 32)
-
-/* software: moves to PTEA.TC (Timing Control) */
-#define _PAGE_PCC_AREA5 0x00000000      /* use BSC registers for area5 */
-#define _PAGE_PCC_AREA6 0x80000000      /* use BSC registers for area6 */
-
-/* software: moves to PTEA.SA[2:0] (Space Attributes) */
-#define _PAGE_PCC_IODYN 0x00000001      /* IO space, dynamically sized bus */
-#define _PAGE_PCC_IO8   0x20000000      /* IO space, 8 bit bus */
-#define _PAGE_PCC_IO16  0x20000001      /* IO space, 16 bit bus */
-#define _PAGE_PCC_COM8  0x40000000      /* Common Memory space, 8 bit bus */
-#define _PAGE_PCC_COM16 0x40000001      /* Common Memory space, 16 bit bus */
-#define _PAGE_PCC_ATR8  0x60000000      /* Attribute Memory space, 8 bit bus */
-#define _PAGE_PCC_ATR16 0x60000001      /* Attribute Memory space, 6 bit bus */
-
-/* Mask which drops unused bits from the PTEL value */
-#if defined(CONFIG_CPU_SH3)
-#define _PAGE_CLEAR_FLAGS       (_PAGE_PROTNONE | _PAGE_ACCESSED| \
-                                 _PAGE_FILE     | _PAGE_SZ1     | \
-                                 _PAGE_HW_SHARED)
-#elif defined(CONFIG_X2TLB)
-/* Get rid of the legacy PR/SZ bits when using extended mode */
-#define _PAGE_CLEAR_FLAGS       (_PAGE_PROTNONE | _PAGE_ACCESSED | \
-                                 _PAGE_FILE | _PAGE_PR_MASK | _PAGE_SZ_MASK)
+#ifdef CONFIG_32BIT
+#define PHYS_ADDR_MASK          0xffffffff
 #else
-#define _PAGE_CLEAR_FLAGS       (_PAGE_PROTNONE | _PAGE_ACCESSED | _PAGE_FILE)
+#define PHYS_ADDR_MASK          0x1fffffff
 #endif
 
-#define _PAGE_FLAGS_HARDWARE_MASK       (0x1fffffff & ~(_PAGE_CLEAR_FLAGS))
+#define PTE_PHYS_MASK           (PHYS_ADDR_MASK & PAGE_MASK)
 
-/* Hardware flags, page size encoding */
-#if defined(CONFIG_X2TLB)
-# if defined(CONFIG_PAGE_SIZE_4KB)
-#  define _PAGE_FLAGS_HARD      _PAGE_EXT(_PAGE_EXT_ESZ0)
-# elif defined(CONFIG_PAGE_SIZE_8KB)
-#  define _PAGE_FLAGS_HARD      _PAGE_EXT(_PAGE_EXT_ESZ1)
-# elif defined(CONFIG_PAGE_SIZE_64KB)
-#  define _PAGE_FLAGS_HARD      _PAGE_EXT(_PAGE_EXT_ESZ2)
-# endif
+#ifdef CONFIG_SUPERH32
+#define VMALLOC_START   (P3SEG)
 #else
-# if defined(CONFIG_PAGE_SIZE_4KB)
-#  define _PAGE_FLAGS_HARD      _PAGE_SZ0
-# elif defined(CONFIG_PAGE_SIZE_64KB)
-#  define _PAGE_FLAGS_HARD      _PAGE_SZ1
-# endif
+#define VMALLOC_START   (0xf0000000)
 #endif
+#define VMALLOC_END     (FIXADDR_START-2*PAGE_SIZE)
 
-#if defined(CONFIG_X2TLB)
-# if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
-#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ2)
-# elif defined(CONFIG_HUGETLB_PAGE_SIZE_256K)
-#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ0 | _PAGE_EXT_ESZ2)
-# elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
-#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ0 | _PAGE_EXT_ESZ1 | _PAGE_EXT_ESZ2)
-# elif defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)
-#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ3)
-# elif defined(CONFIG_HUGETLB_PAGE_SIZE_64MB)
-#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ2 | _PAGE_EXT_ESZ3)
-# endif
+#if defined(CONFIG_SUPERH32)
+#include <asm/pgtable_32.h>
 #else
-# if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
-#  define _PAGE_SZHUGE  (_PAGE_SZ1)
-# elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
-#  define _PAGE_SZHUGE  (_PAGE_SZ0 | _PAGE_SZ1)
-# endif
-#endif
-
-/*
- * Stub out _PAGE_SZHUGE if we don't have a good definition for it,
- * to make pte_mkhuge() happy.
- */
-#ifndef _PAGE_SZHUGE
-# define _PAGE_SZHUGE   (_PAGE_FLAGS_HARD)
-#endif
-
-#define _PAGE_CHG_MASK \
-        (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | _PAGE_DIRTY)
-
-#ifndef __ASSEMBLY__
-
-#if defined(CONFIG_X2TLB) /* SH-X2 TLB */
-#define PAGE_NONE       __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE | \
-                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
-
-#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
-                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
-                                 _PAGE_EXT(_PAGE_EXT_KERN_READ  | \
-                                           _PAGE_EXT_KERN_WRITE | \
-                                           _PAGE_EXT_USER_READ  | \
-                                           _PAGE_EXT_USER_WRITE))
-
-#define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
-                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
-                                 _PAGE_EXT(_PAGE_EXT_KERN_EXEC | \
-                                           _PAGE_EXT_KERN_READ | \
-                                           _PAGE_EXT_USER_EXEC | \
-                                           _PAGE_EXT_USER_READ))
-
-#define PAGE_COPY       PAGE_EXECREAD
-
-#define PAGE_READONLY   __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
-                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
-                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
-                                           _PAGE_EXT_USER_READ))
-
-#define PAGE_WRITEONLY  __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
-                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
-                                 _PAGE_EXT(_PAGE_EXT_KERN_WRITE | \
-                                           _PAGE_EXT_USER_WRITE))
-
-#define PAGE_RWX        __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
-                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
-                                 _PAGE_EXT(_PAGE_EXT_KERN_WRITE | \
-                                           _PAGE_EXT_KERN_READ  | \
-                                           _PAGE_EXT_KERN_EXEC  | \
-                                           _PAGE_EXT_USER_WRITE | \
-                                           _PAGE_EXT_USER_READ  | \
-                                           _PAGE_EXT_USER_EXEC))
-
-#define PAGE_KERNEL     __pgprot(_PAGE_PRESENT | _PAGE_CACHABLE | \
-                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
-                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD | \
-                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
-                                           _PAGE_EXT_KERN_WRITE | \
-                                           _PAGE_EXT_KERN_EXEC))
-
-#define PAGE_KERNEL_NOCACHE \
-                        __pgprot(_PAGE_PRESENT | _PAGE_DIRTY | \
-                                 _PAGE_ACCESSED | _PAGE_HW_SHARED | \
-                                 _PAGE_FLAGS_HARD | \
-                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
-                                           _PAGE_EXT_KERN_WRITE | \
-                                           _PAGE_EXT_KERN_EXEC))
-
-#define PAGE_KERNEL_RO  __pgprot(_PAGE_PRESENT | _PAGE_CACHABLE | \
-                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
-                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD | \
-                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
-                                           _PAGE_EXT_KERN_EXEC))
-
-#define PAGE_KERNEL_PCC(slot, type) \
-                        __pgprot(_PAGE_PRESENT | _PAGE_DIRTY | \
-                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD | \
-                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
-                                           _PAGE_EXT_KERN_WRITE | \
-                                           _PAGE_EXT_KERN_EXEC) \
-                                 (slot ? _PAGE_PCC_AREA5 : _PAGE_PCC_AREA6) | \
-                                 (type))
-
-#elif defined(CONFIG_MMU) /* SH-X TLB */
-#define PAGE_NONE       __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE | \
-                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
-
-#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | \
-                                 _PAGE_CACHABLE | _PAGE_ACCESSED | \
-                                 _PAGE_FLAGS_HARD)
-
-#define PAGE_COPY       __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | \
-                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
-
-#define PAGE_READONLY   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | \
-                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
-
-#define PAGE_EXECREAD   PAGE_READONLY
-#define PAGE_RWX        PAGE_SHARED
-#define PAGE_WRITEONLY  PAGE_SHARED
-
-#define PAGE_KERNEL     __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_CACHABLE | \
-                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
-                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD)
-
-#define PAGE_KERNEL_NOCACHE \
-                        __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | \
-                                 _PAGE_ACCESSED | _PAGE_HW_SHARED | \
-                                 _PAGE_FLAGS_HARD)
-
-#define PAGE_KERNEL_RO  __pgprot(_PAGE_PRESENT | _PAGE_CACHABLE | \
-                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
-                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD)
-
-#define PAGE_KERNEL_PCC(slot, type) \
-                        __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | \
-                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD | \
-                                 (slot ? _PAGE_PCC_AREA5 : _PAGE_PCC_AREA6) | \
-                                 (type))
-#else /* no mmu */
-#define PAGE_NONE               __pgprot(0)
-#define PAGE_SHARED             __pgprot(0)
-#define PAGE_COPY               __pgprot(0)
-#define PAGE_EXECREAD           __pgprot(0)
-#define PAGE_RWX                __pgprot(0)
-#define PAGE_READONLY           __pgprot(0)
-#define PAGE_WRITEONLY          __pgprot(0)
-#define PAGE_KERNEL             __pgprot(0)
-#define PAGE_KERNEL_NOCACHE     __pgprot(0)
-#define PAGE_KERNEL_RO          __pgprot(0)
-
-#define PAGE_KERNEL_PCC(slot, type) \
-                                __pgprot(0)
+#include <asm/pgtable_64.h>
 #endif
 
-#endif /* __ASSEMBLY__ */
-
 /*
  * SH-X and lower (legacy) SuperH parts (SH-3, SH-4, some SH-4A) can't do page
  * protection for execute, and considers it the same as a read. Also, write
@@ -357,208 +118,6 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 #define __S110  PAGE_RWX
 #define __S111  PAGE_RWX
 
-#ifndef __ASSEMBLY__
-
-/*
- * Certain architectures need to do special things when PTEs
- * within a page table are directly modified.  Thus, the following
- * hook is made available.
- */
-#ifdef CONFIG_X2TLB
-static inline void set_pte(pte_t *ptep, pte_t pte)
-{
-        ptep->pte_high = pte.pte_high;
-        smp_wmb();
-        ptep->pte_low = pte.pte_low;
-}
-#else
-#define set_pte(pteptr, pteval) (*(pteptr) = pteval)
-#endif
-
-#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
-
-/*
- * (pmds are folded into pgds so this doesn't get actually called,
- * but the define is needed for a generic inline function.)
- */
-#define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
-
-#define pte_pfn(x)              ((unsigned long)(((x).pte_low >> PAGE_SHIFT)))
-
-#define pfn_pte(pfn, prot) \
-        __pte(((unsigned long long)(pfn) << PAGE_SHIFT) | pgprot_val(prot))
-#define pfn_pmd(pfn, prot) \
-        __pmd(((unsigned long long)(pfn) << PAGE_SHIFT) | pgprot_val(prot))
-
-#define pte_none(x)             (!pte_val(x))
-#define pte_present(x)          ((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE))
-
-#define pte_clear(mm,addr,xp) do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
-
-#define pmd_none(x)     (!pmd_val(x))
-#define pmd_present(x)  (pmd_val(x))
-#define pmd_clear(xp)   do { set_pmd(xp, __pmd(0)); } while (0)
-#define pmd_bad(x)      (pmd_val(x) & ~PAGE_MASK)
-
-#define pages_to_mb(x)  ((x) >> (20-PAGE_SHIFT))
-#define pte_page(x)     pfn_to_page(pte_pfn(x))
-
-/*
- * The following only work if pte_present() is true.
- * Undefined behaviour if not..
- */
-#define pte_not_present(pte)    (!((pte).pte_low & _PAGE_PRESENT))
-#define pte_dirty(pte)          ((pte).pte_low & _PAGE_DIRTY)
-#define pte_young(pte)          ((pte).pte_low & _PAGE_ACCESSED)
-#define pte_file(pte)           ((pte).pte_low & _PAGE_FILE)
-
-#ifdef CONFIG_X2TLB
-#define pte_write(pte)          ((pte).pte_high & _PAGE_EXT_USER_WRITE)
-#else
-#define pte_write(pte)          ((pte).pte_low & _PAGE_RW)
-#endif
-
-#define PTE_BIT_FUNC(h,fn,op) \
-static inline pte_t pte_##fn(pte_t pte) { pte.pte_##h op; return pte; }
-
-#ifdef CONFIG_X2TLB
-/*
- * We cheat a bit in the SH-X2 TLB case. As the permission bits are
- * individually toggled (and user permissions are entirely decoupled from
- * kernel permissions), we attempt to couple them a bit more sanely here.
- */
-PTE_BIT_FUNC(high, wrprotect, &= ~_PAGE_EXT_USER_WRITE);
-PTE_BIT_FUNC(high, mkwrite, |= _PAGE_EXT_USER_WRITE | _PAGE_EXT_KERN_WRITE);
-PTE_BIT_FUNC(high, mkhuge, |= _PAGE_SZHUGE);
-#else
-PTE_BIT_FUNC(low, wrprotect, &= ~_PAGE_RW);
-PTE_BIT_FUNC(low, mkwrite, |= _PAGE_RW);
-PTE_BIT_FUNC(low, mkhuge, |= _PAGE_SZHUGE);
-#endif
-
-PTE_BIT_FUNC(low, mkclean, &= ~_PAGE_DIRTY);
-PTE_BIT_FUNC(low, mkdirty, |= _PAGE_DIRTY);
-PTE_BIT_FUNC(low, mkold, &= ~_PAGE_ACCESSED);
-PTE_BIT_FUNC(low, mkyoung, |= _PAGE_ACCESSED);
-
-/*
- * Macro and implementation to make a page protection as uncachable.
- */
-#define pgprot_writecombine(prot) \
-        __pgprot(pgprot_val(prot) & ~_PAGE_CACHABLE)
-
-#define pgprot_noncached         pgprot_writecombine
-
-/*
- * Conversion functions: convert a page and protection to a page entry,
- * and a page entry and page directory to the page they refer to.
- *
- * extern pte_t mk_pte(struct page *page, pgprot_t pgprot)
- */
-#define mk_pte(page, pgprot)    pfn_pte(page_to_pfn(page), (pgprot))
-
-static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
-{
-        pte.pte_low &= _PAGE_CHG_MASK;
-        pte.pte_low |= pgprot_val(newprot);
-
-#ifdef CONFIG_X2TLB
-        pte.pte_high |= pgprot_val(newprot) >> 32;
-#endif
-
-        return pte;
-}
-
-#define pmd_page_vaddr(pmd)     ((unsigned long)pmd_val(pmd))
-#define pmd_page(pmd)           (virt_to_page(pmd_val(pmd)))
-
-/* to find an entry in a page-table-directory. */
-#define pgd_index(address)      (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
-#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
-
-/* to find an entry in a kernel page-table-directory */
-#define pgd_offset_k(address)   pgd_offset(&init_mm, address)
-
-/* Find an entry in the third-level page table.. */
-#define pte_index(address)      ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-#define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address))
-#define pte_offset_map(dir, address)            pte_offset_kernel(dir, address)
-#define pte_offset_map_nested(dir, address)     pte_offset_kernel(dir, address)
-
-#define pte_unmap(pte)          do { } while (0)
-#define pte_unmap_nested(pte)   do { } while (0)
-
-#ifdef CONFIG_X2TLB
-#define pte_ERROR(e) \
-        printk("%s:%d: bad pte %p(%08lx%08lx).\n", __FILE__, __LINE__, \
-               &(e), (e).pte_high, (e).pte_low)
-#define pgd_ERROR(e) \
-        printk("%s:%d: bad pgd %016llx.\n", __FILE__, __LINE__, pgd_val(e))
-#else
-#define pte_ERROR(e) \
-        printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
-#define pgd_ERROR(e) \
-        printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
-#endif
-
-struct vm_area_struct;
-extern void update_mmu_cache(struct vm_area_struct * vma,
-                             unsigned long address, pte_t pte);
-
-/*
- * Encode and de-code a swap entry
- *
- * Constraints:
- *      _PAGE_FILE at bit 0
- *      _PAGE_PRESENT at bit 8
- *      _PAGE_PROTNONE at bit 9
- *
- * For the normal case, we encode the swap type into bits 0:7 and the
- * swap offset into bits 10:30. For the 64-bit PTE case, we keep the
- * preserved bits in the low 32-bits and use the upper 32 as the swap
- * offset (along with a 5-bit type), following the same approach as x86
- * PAE. This keeps the logic quite simple, and allows for a full 32
- * PTE_FILE_MAX_BITS, as opposed to the 29-bits we're constrained with
- * in the pte_low case.
- *
- * As is evident by the Alpha code, if we ever get a 64-bit unsigned
- * long (swp_entry_t) to match up with the 64-bit PTEs, this all becomes
- * much cleaner..
- *
- * NOTE: We should set ZEROs at the position of _PAGE_PRESENT
- *       and _PAGE_PROTNONE bits
- */
-#ifdef CONFIG_X2TLB
-#define __swp_type(x)                   ((x).val & 0x1f)
-#define __swp_offset(x)                 ((x).val >> 5)
-#define __swp_entry(type, offset)       ((swp_entry_t){ (type) | (offset) << 5})
-#define __pte_to_swp_entry(pte)         ((swp_entry_t){ (pte).pte_high })
-#define __swp_entry_to_pte(x)           ((pte_t){ 0, (x).val })
-
-/*
- * Encode and decode a nonlinear file mapping entry
- */
-#define pte_to_pgoff(pte)               ((pte).pte_high)
-#define pgoff_to_pte(off)               ((pte_t) { _PAGE_FILE, (off) })
-
-#define PTE_FILE_MAX_BITS               32
-#else
-#define __swp_type(x)                   ((x).val & 0xff)
-#define __swp_offset(x)                 ((x).val >> 10)
-#define __swp_entry(type, offset)       ((swp_entry_t){(type) | (offset) <<10})
-
-#define __pte_to_swp_entry(pte)         ((swp_entry_t) { pte_val(pte) >> 1 })
-#define __swp_entry_to_pte(x)           ((pte_t) { (x).val << 1 })
-
-/*
- * Encode and decode a nonlinear file mapping entry
- */
-#define PTE_FILE_MAX_BITS       29
-#define pte_to_pgoff(pte)       (pte_val(pte) >> 1)
-#define pgoff_to_pte(off)       ((pte_t) { ((off) << 1) | _PAGE_FILE })
-#endif
-
 typedef pte_t *pte_addr_t;
 
 #define kern_addr_valid(addr)   (1)
@@ -566,27 +125,28 @@ typedef pte_t *pte_addr_t;
 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot)         \
                 remap_pfn_range(vma, vaddr, pfn, size, prot)
 
-struct mm_struct;
+#define pte_pfn(x)              ((unsigned long)(((x).pte_low >> PAGE_SHIFT)))
 
 /*
  * No page table caches to initialise
  */
 #define pgtable_cache_init()    do { } while (0)
 
-#ifndef CONFIG_MMU
-extern unsigned int kobjsize(const void *objp);
-#endif /* !CONFIG_MMU */
-
 #if !defined(CONFIG_CACHE_OFF) && (defined(CONFIG_CPU_SH4) || \
         defined(CONFIG_SH7705_CACHE_32KB))
+struct mm_struct;
 #define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-extern pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
+pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
 #endif
 
+struct vm_area_struct;
+extern void update_mmu_cache(struct vm_area_struct * vma,
+                             unsigned long address, pte_t pte);
 extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
 extern void paging_init(void);
+extern void page_table_range_init(unsigned long start, unsigned long end,
+                                  pgd_t *pgd);
 
 #include <asm-generic/pgtable.h>
 
-#endif /* !__ASSEMBLY__ */
-#endif /* __ASM_SH_PAGE_H */
+#endif /* __ASM_SH_PGTABLE_H */
diff --git a/include/asm-sh/pgtable_32.h b/include/asm-sh/pgtable_32.h
new file mode 100644
index 000000000000..3e3557c53c55
--- /dev/null
+++ b/include/asm-sh/pgtable_32.h
@@ -0,0 +1,474 @@
+#ifndef __ASM_SH_PGTABLE_32_H
+#define __ASM_SH_PGTABLE_32_H
+
+/*
+ * Linux PTEL encoding.
+ *
+ * Hardware and software bit definitions for the PTEL value (see below for
+ * notes on SH-X2 MMUs and 64-bit PTEs):
+ *
+ * - Bits 0 and 7 are reserved on SH-3 (_PAGE_WT and _PAGE_SZ1 on SH-4).
+ *
+ * - Bit 1 is the SH-bit, but is unused on SH-3 due to an MMU bug (the
+ *   hardware PTEL value can't have the SH-bit set when MMUCR.IX is set,
+ *   which is the default in cpu-sh3/mmu_context.h:MMU_CONTROL_INIT).
+ *
+ *   In order to keep this relatively clean, do not use these for defining
+ *   SH-3 specific flags until all of the other unused bits have been
+ *   exhausted.
+ *
+ * - Bit 9 is reserved by everyone and used by _PAGE_PROTNONE.
+ *
+ * - Bits 10 and 11 are low bits of the PPN that are reserved on >= 4K pages.
+ *   Bit 10 is used for _PAGE_ACCESSED, bit 11 remains unused.
+ *
+ * - On 29 bit platforms, bits 31 to 29 are used for the space attributes
+ *   and timing control which (together with bit 0) are moved into the
+ *   old-style PTEA on the parts that support it.
+ *
+ * XXX: Leave the _PAGE_FILE and _PAGE_WT overhaul for a rainy day.
+ *
+ * SH-X2 MMUs and extended PTEs
+ *
+ * SH-X2 supports an extended mode TLB with split data arrays due to the
+ * number of bits needed for PR and SZ (now EPR and ESZ) encodings. The PR and
+ * SZ bit placeholders still exist in data array 1, but are implemented as
+ * reserved bits, with the real logic existing in data array 2.
+ *
+ * The downside to this is that we can no longer fit everything in to a 32-bit
+ * PTE encoding, so a 64-bit pte_t is necessary for these parts. On the plus
+ * side, this gives us quite a few spare bits to play with for future usage.
+ */
+/* Legacy and compat mode bits */
+#define _PAGE_WT        0x001           /* WT-bit on SH-4, 0 on SH-3 */
+#define _PAGE_HW_SHARED 0x002           /* SH-bit  : shared among processes */
+#define _PAGE_DIRTY     0x004           /* D-bit   : page changed */
+#define _PAGE_CACHABLE  0x008           /* C-bit   : cachable */
+#define _PAGE_SZ0       0x010           /* SZ0-bit : Size of page */
+#define _PAGE_RW        0x020           /* PR0-bit : write access allowed */
+#define _PAGE_USER      0x040           /* PR1-bit : user space access allowed*/
+#define _PAGE_SZ1       0x080           /* SZ1-bit : Size of page (on SH-4) */
+#define _PAGE_PRESENT   0x100           /* V-bit   : page is valid */
+#define _PAGE_PROTNONE  0x200           /* software: if not present  */
+#define _PAGE_ACCESSED  0x400           /* software: page referenced */
+#define _PAGE_FILE      _PAGE_WT        /* software: pagecache or swap? */
+
+#define _PAGE_SZ_MASK   (_PAGE_SZ0 | _PAGE_SZ1)
+#define _PAGE_PR_MASK   (_PAGE_RW | _PAGE_USER)
+
+/* Extended mode bits */
+#define _PAGE_EXT_ESZ0          0x0010  /* ESZ0-bit: Size of page */
+#define _PAGE_EXT_ESZ1          0x0020  /* ESZ1-bit: Size of page */
+#define _PAGE_EXT_ESZ2          0x0040  /* ESZ2-bit: Size of page */
+#define _PAGE_EXT_ESZ3          0x0080  /* ESZ3-bit: Size of page */
+
+#define _PAGE_EXT_USER_EXEC     0x0100  /* EPR0-bit: User space executable */
+#define _PAGE_EXT_USER_WRITE    0x0200  /* EPR1-bit: User space writable */
+#define _PAGE_EXT_USER_READ     0x0400  /* EPR2-bit: User space readable */
+
+#define _PAGE_EXT_KERN_EXEC     0x0800  /* EPR3-bit: Kernel space executable */
+#define _PAGE_EXT_KERN_WRITE    0x1000  /* EPR4-bit: Kernel space writable */
+#define _PAGE_EXT_KERN_READ     0x2000  /* EPR5-bit: Kernel space readable */
+
+/* Wrapper for extended mode pgprot twiddling */
+#define _PAGE_EXT(x)            ((unsigned long long)(x) << 32)
+
+/* software: moves to PTEA.TC (Timing Control) */
+#define _PAGE_PCC_AREA5 0x00000000      /* use BSC registers for area5 */
+#define _PAGE_PCC_AREA6 0x80000000      /* use BSC registers for area6 */
+
+/* software: moves to PTEA.SA[2:0] (Space Attributes) */
+#define _PAGE_PCC_IODYN 0x00000001      /* IO space, dynamically sized bus */
+#define _PAGE_PCC_IO8   0x20000000      /* IO space, 8 bit bus */
+#define _PAGE_PCC_IO16  0x20000001      /* IO space, 16 bit bus */
+#define _PAGE_PCC_COM8  0x40000000      /* Common Memory space, 8 bit bus */
+#define _PAGE_PCC_COM16 0x40000001      /* Common Memory space, 16 bit bus */
+#define _PAGE_PCC_ATR8  0x60000000      /* Attribute Memory space, 8 bit bus */
+#define _PAGE_PCC_ATR16 0x60000001      /* Attribute Memory space, 6 bit bus */
+
+/* Mask which drops unused bits from the PTEL value */
+#if defined(CONFIG_CPU_SH3)
+#define _PAGE_CLEAR_FLAGS       (_PAGE_PROTNONE | _PAGE_ACCESSED| \
+                                 _PAGE_FILE     | _PAGE_SZ1     | \
+                                 _PAGE_HW_SHARED)
+#elif defined(CONFIG_X2TLB)
+/* Get rid of the legacy PR/SZ bits when using extended mode */
+#define _PAGE_CLEAR_FLAGS       (_PAGE_PROTNONE | _PAGE_ACCESSED | \
+                                 _PAGE_FILE | _PAGE_PR_MASK | _PAGE_SZ_MASK)
+#else
+#define _PAGE_CLEAR_FLAGS       (_PAGE_PROTNONE | _PAGE_ACCESSED | _PAGE_FILE)
+#endif
+
+#define _PAGE_FLAGS_HARDWARE_MASK       (PHYS_ADDR_MASK & ~(_PAGE_CLEAR_FLAGS))
+
+/* Hardware flags, page size encoding */
+#if defined(CONFIG_X2TLB)
+# if defined(CONFIG_PAGE_SIZE_4KB)
+#  define _PAGE_FLAGS_HARD      _PAGE_EXT(_PAGE_EXT_ESZ0)
+# elif defined(CONFIG_PAGE_SIZE_8KB)
+#  define _PAGE_FLAGS_HARD      _PAGE_EXT(_PAGE_EXT_ESZ1)
+# elif defined(CONFIG_PAGE_SIZE_64KB)
+#  define _PAGE_FLAGS_HARD      _PAGE_EXT(_PAGE_EXT_ESZ2)
+# endif
+#else
+# if defined(CONFIG_PAGE_SIZE_4KB)
+#  define _PAGE_FLAGS_HARD      _PAGE_SZ0
+# elif defined(CONFIG_PAGE_SIZE_64KB)
+#  define _PAGE_FLAGS_HARD      _PAGE_SZ1
+# endif
+#endif
+
+#if defined(CONFIG_X2TLB)
+# if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
+#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ2)
+# elif defined(CONFIG_HUGETLB_PAGE_SIZE_256K)
+#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ0 | _PAGE_EXT_ESZ2)
+# elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
+#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ0 | _PAGE_EXT_ESZ1 | _PAGE_EXT_ESZ2)
+# elif defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)
+#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ3)
+# elif defined(CONFIG_HUGETLB_PAGE_SIZE_64MB)
+#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ2 | _PAGE_EXT_ESZ3)
+# endif
+#else
+# if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
+#  define _PAGE_SZHUGE  (_PAGE_SZ1)
+# elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
+#  define _PAGE_SZHUGE  (_PAGE_SZ0 | _PAGE_SZ1)
+# endif
+#endif
+
+/*
+ * Stub out _PAGE_SZHUGE if we don't have a good definition for it,
+ * to make pte_mkhuge() happy.
+ */
+#ifndef _PAGE_SZHUGE
+# define _PAGE_SZHUGE   (_PAGE_FLAGS_HARD)
+#endif
+
+#define _PAGE_CHG_MASK \
+        (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | _PAGE_DIRTY)
+
+#ifndef __ASSEMBLY__
+
+#if defined(CONFIG_X2TLB) /* SH-X2 TLB */
+#define PAGE_NONE       __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
+
+#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
+                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ  | \
+                                           _PAGE_EXT_KERN_WRITE | \
+                                           _PAGE_EXT_USER_READ  | \
+                                           _PAGE_EXT_USER_WRITE))
+
+#define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
+                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_EXEC | \
+                                           _PAGE_EXT_KERN_READ | \
+                                           _PAGE_EXT_USER_EXEC | \
+                                           _PAGE_EXT_USER_READ))
+
+#define PAGE_COPY       PAGE_EXECREAD
+
+#define PAGE_READONLY   __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
+                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
+                                           _PAGE_EXT_USER_READ))
+
+#define PAGE_WRITEONLY  __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
+                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_WRITE | \
+                                           _PAGE_EXT_USER_WRITE))
+
+#define PAGE_RWX        __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
+                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_WRITE | \
+                                           _PAGE_EXT_KERN_READ  | \
+                                           _PAGE_EXT_KERN_EXEC  | \
+                                           _PAGE_EXT_USER_WRITE | \
+                                           _PAGE_EXT_USER_READ  | \
+                                           _PAGE_EXT_USER_EXEC))
+
+#define PAGE_KERNEL     __pgprot(_PAGE_PRESENT | _PAGE_CACHABLE | \
+                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
+                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
+                                           _PAGE_EXT_KERN_WRITE | \
+                                           _PAGE_EXT_KERN_EXEC))
+
+#define PAGE_KERNEL_NOCACHE \
+                        __pgprot(_PAGE_PRESENT | _PAGE_DIRTY | \
+                                 _PAGE_ACCESSED | _PAGE_HW_SHARED | \
+                                 _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
+                                           _PAGE_EXT_KERN_WRITE | \
+                                           _PAGE_EXT_KERN_EXEC))
+
+#define PAGE_KERNEL_RO  __pgprot(_PAGE_PRESENT | _PAGE_CACHABLE | \
+                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
+                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
+                                           _PAGE_EXT_KERN_EXEC))
+
+#define PAGE_KERNEL_PCC(slot, type) \
+                        __pgprot(_PAGE_PRESENT | _PAGE_DIRTY | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
+                                           _PAGE_EXT_KERN_WRITE | \
+                                           _PAGE_EXT_KERN_EXEC) \
+                                 (slot ? _PAGE_PCC_AREA5 : _PAGE_PCC_AREA6) | \
+                                 (type))
+
+#elif defined(CONFIG_MMU) /* SH-X TLB */
+#define PAGE_NONE       __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
+
+#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | \
+                                 _PAGE_CACHABLE | _PAGE_ACCESSED | \
+                                 _PAGE_FLAGS_HARD)
+
+#define PAGE_COPY       __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
+
+#define PAGE_READONLY   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
+
+#define PAGE_EXECREAD   PAGE_READONLY
+#define PAGE_RWX        PAGE_SHARED
+#define PAGE_WRITEONLY  PAGE_SHARED
+
+#define PAGE_KERNEL     __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_CACHABLE | \
+                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
+                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD)
+
+#define PAGE_KERNEL_NOCACHE \
+                        __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | \
+                                 _PAGE_ACCESSED | _PAGE_HW_SHARED | \
+                                 _PAGE_FLAGS_HARD)
+
+#define PAGE_KERNEL_RO  __pgprot(_PAGE_PRESENT | _PAGE_CACHABLE | \
+                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
+                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD)
+
+#define PAGE_KERNEL_PCC(slot, type) \
+                        __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD | \
+                                 (slot ? _PAGE_PCC_AREA5 : _PAGE_PCC_AREA6) | \
+                                 (type))
+#else /* no mmu */
+#define PAGE_NONE               __pgprot(0)
+#define PAGE_SHARED             __pgprot(0)
+#define PAGE_COPY               __pgprot(0)
+#define PAGE_EXECREAD           __pgprot(0)
+#define PAGE_RWX                __pgprot(0)
+#define PAGE_READONLY           __pgprot(0)
+#define PAGE_WRITEONLY          __pgprot(0)
+#define PAGE_KERNEL             __pgprot(0)
+#define PAGE_KERNEL_NOCACHE     __pgprot(0)
+#define PAGE_KERNEL_RO          __pgprot(0)
+
+#define PAGE_KERNEL_PCC(slot, type) \
+                                __pgprot(0)
+#endif
+
+#endif /* __ASSEMBLY__ */
+
+#ifndef __ASSEMBLY__
+
+/*
+ * Certain architectures need to do special things when PTEs
+ * within a page table are directly modified.  Thus, the following
+ * hook is made available.
+ */
+#ifdef CONFIG_X2TLB
+static inline void set_pte(pte_t *ptep, pte_t pte)
+{
+        ptep->pte_high = pte.pte_high;
+        smp_wmb();
+        ptep->pte_low = pte.pte_low;
+}
+#else
+#define set_pte(pteptr, pteval) (*(pteptr) = pteval)
+#endif
+
+#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
+
+/*
+ * (pmds are folded into pgds so this doesn't get actually called,
+ * but the define is needed for a generic inline function.)
+ */
+#define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
+
+#define pfn_pte(pfn, prot) \
+        __pte(((unsigned long long)(pfn) << PAGE_SHIFT) | pgprot_val(prot))
+#define pfn_pmd(pfn, prot) \
+        __pmd(((unsigned long long)(pfn) << PAGE_SHIFT) | pgprot_val(prot))
+
+#define pte_none(x)             (!pte_val(x))
+#define pte_present(x)          ((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE))
+
+#define pte_clear(mm,addr,xp) do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
+
+#define pmd_none(x)     (!pmd_val(x))
+#define pmd_present(x)  (pmd_val(x))
+#define pmd_clear(xp)   do { set_pmd(xp, __pmd(0)); } while (0)
+#define pmd_bad(x)      (pmd_val(x) & ~PAGE_MASK)
+
+#define pages_to_mb(x)  ((x) >> (20-PAGE_SHIFT))
+#define pte_page(x)     pfn_to_page(pte_pfn(x))
+
+/*
+ * The following only work if pte_present() is true.
+ * Undefined behaviour if not..
+ */
+#define pte_not_present(pte)    (!((pte).pte_low & _PAGE_PRESENT))
+#define pte_dirty(pte)          ((pte).pte_low & _PAGE_DIRTY)
+#define pte_young(pte)          ((pte).pte_low & _PAGE_ACCESSED)
+#define pte_file(pte)           ((pte).pte_low & _PAGE_FILE)
+
+#ifdef CONFIG_X2TLB
+#define pte_write(pte)          ((pte).pte_high & _PAGE_EXT_USER_WRITE)
+#else
+#define pte_write(pte)          ((pte).pte_low & _PAGE_RW)
+#endif
+
+#define PTE_BIT_FUNC(h,fn,op) \
+static inline pte_t pte_##fn(pte_t pte) { pte.pte_##h op; return pte; }
+
+#ifdef CONFIG_X2TLB
+/*
+ * We cheat a bit in the SH-X2 TLB case. As the permission bits are
+ * individually toggled (and user permissions are entirely decoupled from
+ * kernel permissions), we attempt to couple them a bit more sanely here.
+ */
+PTE_BIT_FUNC(high, wrprotect, &= ~_PAGE_EXT_USER_WRITE);
+PTE_BIT_FUNC(high, mkwrite, |= _PAGE_EXT_USER_WRITE | _PAGE_EXT_KERN_WRITE);
+PTE_BIT_FUNC(high, mkhuge, |= _PAGE_SZHUGE);
+#else
+PTE_BIT_FUNC(low, wrprotect, &= ~_PAGE_RW);
+PTE_BIT_FUNC(low, mkwrite, |= _PAGE_RW);
+PTE_BIT_FUNC(low, mkhuge, |= _PAGE_SZHUGE);
+#endif
+
+PTE_BIT_FUNC(low, mkclean, &= ~_PAGE_DIRTY);
+PTE_BIT_FUNC(low, mkdirty, |= _PAGE_DIRTY);
+PTE_BIT_FUNC(low, mkold, &= ~_PAGE_ACCESSED);
+PTE_BIT_FUNC(low, mkyoung, |= _PAGE_ACCESSED);
+
+/*
+ * Macro and implementation to make a page protection as uncachable.
+ */
+#define pgprot_writecombine(prot) \
+        __pgprot(pgprot_val(prot) & ~_PAGE_CACHABLE)
+
+#define pgprot_noncached         pgprot_writecombine
+
+/*
+ * Conversion functions: convert a page and protection to a page entry,
+ * and a page entry and page directory to the page they refer to.
+ *
+ * extern pte_t mk_pte(struct page *page, pgprot_t pgprot)
+ */
+#define mk_pte(page, pgprot)    pfn_pte(page_to_pfn(page), (pgprot))
+
+static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+{
+        pte.pte_low &= _PAGE_CHG_MASK;
+        pte.pte_low |= pgprot_val(newprot);
+
+#ifdef CONFIG_X2TLB
+        pte.pte_high |= pgprot_val(newprot) >> 32;
+#endif
+
+        return pte;
+}
+
+#define pmd_page_vaddr(pmd)     ((unsigned long)pmd_val(pmd))
+#define pmd_page(pmd)           (virt_to_page(pmd_val(pmd)))
+
+/* to find an entry in a page-table-directory. */
+#define pgd_index(address)      (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
+#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
+
+/* to find an entry in a kernel page-table-directory */
+#define pgd_offset_k(address)   pgd_offset(&init_mm, address)
+
+/* Find an entry in the third-level page table.. */
+#define pte_index(address)      ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+#define pte_offset_kernel(dir, address) \
+        ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address))
+#define pte_offset_map(dir, address)            pte_offset_kernel(dir, address)
+#define pte_offset_map_nested(dir, address)     pte_offset_kernel(dir, address)
+
+#define pte_unmap(pte)          do { } while (0)
+#define pte_unmap_nested(pte)   do { } while (0)
+
+#ifdef CONFIG_X2TLB
+#define pte_ERROR(e) \
+        printk("%s:%d: bad pte %p(%08lx%08lx).\n", __FILE__, __LINE__, \
+               &(e), (e).pte_high, (e).pte_low)
+#define pgd_ERROR(e) \
+        printk("%s:%d: bad pgd %016llx.\n", __FILE__, __LINE__, pgd_val(e))
+#else
+#define pte_ERROR(e) \
+        printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
+#define pgd_ERROR(e) \
+        printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
+#endif
+
+/*
+ * Encode and de-code a swap entry
+ *
+ * Constraints:
+ *      _PAGE_FILE at bit 0
+ *      _PAGE_PRESENT at bit 8
+ *      _PAGE_PROTNONE at bit 9
+ *
+ * For the normal case, we encode the swap type into bits 0:7 and the
+ * swap offset into bits 10:30. For the 64-bit PTE case, we keep the
+ * preserved bits in the low 32-bits and use the upper 32 as the swap
+ * offset (along with a 5-bit type), following the same approach as x86
+ * PAE. This keeps the logic quite simple, and allows for a full 32
+ * PTE_FILE_MAX_BITS, as opposed to the 29-bits we're constrained with
+ * in the pte_low case.
+ *
+ * As is evident by the Alpha code, if we ever get a 64-bit unsigned
+ * long (swp_entry_t) to match up with the 64-bit PTEs, this all becomes
+ * much cleaner..
+ *
+ * NOTE: We should set ZEROs at the position of _PAGE_PRESENT
+ *       and _PAGE_PROTNONE bits
+ */
+#ifdef CONFIG_X2TLB
+#define __swp_type(x)                   ((x).val & 0x1f)
+#define __swp_offset(x)                 ((x).val >> 5)
+#define __swp_entry(type, offset)       ((swp_entry_t){ (type) | (offset) << 5})
+#define __pte_to_swp_entry(pte)         ((swp_entry_t){ (pte).pte_high })
+#define __swp_entry_to_pte(x)           ((pte_t){ 0, (x).val })
+
+/*
+ * Encode and decode a nonlinear file mapping entry
+ */
+#define pte_to_pgoff(pte)               ((pte).pte_high)
+#define pgoff_to_pte(off)               ((pte_t) { _PAGE_FILE, (off) })
+
+#define PTE_FILE_MAX_BITS               32
+#else
+#define __swp_type(x)                   ((x).val & 0xff)
+#define __swp_offset(x)                 ((x).val >> 10)
+#define __swp_entry(type, offset)       ((swp_entry_t){(type) | (offset) <<10})
+
+#define __pte_to_swp_entry(pte)         ((swp_entry_t) { pte_val(pte) >> 1 })
+#define __swp_entry_to_pte(x)           ((pte_t) { (x).val << 1 })
+
+/*
+ * Encode and decode a nonlinear file mapping entry
+ */
+#define PTE_FILE_MAX_BITS       29
+#define pte_to_pgoff(pte)       (pte_val(pte) >> 1)
+#define pgoff_to_pte(off)       ((pte_t) { ((off) << 1) | _PAGE_FILE })
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ASM_SH_PGTABLE_32_H */
diff --git a/include/asm-sh64/pgtable.h b/include/asm-sh/pgtable_64.h
index 3488fe32e436..972211671c9a 100644
--- a/include/asm-sh64/pgtable.h
+++ b/include/asm-sh/pgtable_64.h
@@ -1,136 +1,40 @@
-#ifndef __ASM_SH64_PGTABLE_H
-#define __ASM_SH64_PGTABLE_H
-
-#include <asm-generic/4level-fixup.h>
+#ifndef __ASM_SH_PGTABLE_64_H
+#define __ASM_SH_PGTABLE_64_H
 
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
+ * include/asm-sh/pgtable_64.h
  *
- * include/asm-sh64/pgtable.h
+ * This file contains the functions and defines necessary to modify and use
+ * the SuperH page table tree.
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003, 2004  Paul Mundt
  * Copyright (C) 2003, 2004  Richard Curnow
  *
- * This file contains the functions and defines necessary to modify and use
- * the SuperH page table tree.
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
-#ifndef __ASSEMBLY__
+#include <linux/threads.h>
 #include <asm/processor.h>
 #include <asm/page.h>
-#include <linux/threads.h>
-
-struct vm_area_struct;
-
-extern void paging_init(void);
-
-/* We provide our own get_unmapped_area to avoid cache synonym issue */
-#define HAVE_ARCH_UNMAPPED_AREA
-
-/*
- * Basically we have the same two-level (which is the logical three level
- * Linux page table layout folded) page tables as the i386.
- */
-
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-extern unsigned char empty_zero_page[PAGE_SIZE];
-#define ZERO_PAGE(vaddr) (mem_map + MAP_NR(empty_zero_page))
-
-#endif /* !__ASSEMBLY__ */
-
-/*
- * NEFF and NPHYS related defines.
- * FIXME : These need to be model-dependent.  For now this is OK, SH5-101 and SH5-103
- * implement 32 bits effective and 32 bits physical.  But future implementations may
- * extend beyond this.
- */
-#define NEFF            32
-#define NEFF_SIGN       (1LL << (NEFF - 1))
-#define NEFF_MASK       (-1LL << NEFF)
-
-#define NPHYS           32
-#define NPHYS_SIGN      (1LL << (NPHYS - 1))
-#define NPHYS_MASK      (-1LL << NPHYS)
-
-/* Typically 2-level is sufficient up to 32 bits of virtual address space, beyond
-   that 3-level would be appropriate. */
-#if defined(CONFIG_SH64_PGTABLE_2_LEVEL)
-/* For 4k pages, this contains 512 entries, i.e. 9 bits worth of address. */
-#define PTRS_PER_PTE    ((1<<PAGE_SHIFT)/sizeof(unsigned long long))
-#define PTE_MAGNITUDE   3             /* sizeof(unsigned long long) magnit. */
-#define PTE_SHIFT       PAGE_SHIFT
-#define PTE_BITS        (PAGE_SHIFT - PTE_MAGNITUDE)
-
-/* top level: PMD. */
-#define PGDIR_SHIFT     (PTE_SHIFT + PTE_BITS)
-#define PGD_BITS        (NEFF - PGDIR_SHIFT)
-#define PTRS_PER_PGD    (1<<PGD_BITS)
-
-/* middle level: PMD. This doesn't do anything for the 2-level case. */
-#define PTRS_PER_PMD    (1)
-
-#define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
-#define PGDIR_MASK      (~(PGDIR_SIZE-1))
-#define PMD_SHIFT       PGDIR_SHIFT
-#define PMD_SIZE        PGDIR_SIZE
-#define PMD_MASK        PGDIR_MASK
-
-#elif defined(CONFIG_SH64_PGTABLE_3_LEVEL)
-/*
- * three-level asymmetric paging structure: PGD is top level.
- * The asymmetry comes from 32-bit pointers and 64-bit PTEs.
- */
-/* bottom level: PTE. It's 9 bits = 512 pointers */
-#define PTRS_PER_PTE    ((1<<PAGE_SHIFT)/sizeof(unsigned long long))
-#define PTE_MAGNITUDE   3             /* sizeof(unsigned long long) magnit. */
-#define PTE_SHIFT       PAGE_SHIFT
-#define PTE_BITS        (PAGE_SHIFT - PTE_MAGNITUDE)
-
-/* middle level: PMD. It's 10 bits = 1024 pointers */
-#define PTRS_PER_PMD    ((1<<PAGE_SHIFT)/sizeof(unsigned long long *))
-#define PMD_MAGNITUDE   2             /* sizeof(unsigned long long *) magnit. */
-#define PMD_SHIFT       (PTE_SHIFT + PTE_BITS)
-#define PMD_BITS        (PAGE_SHIFT - PMD_MAGNITUDE)
-
-/* top level: PMD. It's 1 bit = 2 pointers */
-#define PGDIR_SHIFT     (PMD_SHIFT + PMD_BITS)
-#define PGD_BITS        (NEFF - PGDIR_SHIFT)
-#define PTRS_PER_PGD    (1<<PGD_BITS)
-
-#define PMD_SIZE        (1UL << PMD_SHIFT)
-#define PMD_MASK        (~(PMD_SIZE-1))
-#define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
-#define PGDIR_MASK      (~(PGDIR_SIZE-1))
-
-#else
-#error "No defined number of page table levels"
-#endif
 
 /*
  * Error outputs.
  */
 #define pte_ERROR(e) \
         printk("%s:%d: bad pte %016Lx.\n", __FILE__, __LINE__, pte_val(e))
-#define pmd_ERROR(e) \
-        printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
 #define pgd_ERROR(e) \
         printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
 
 /*
  * Table setting routines. Used within arch/mm only.
  */
-#define set_pgd(pgdptr, pgdval) (*(pgdptr) = pgdval)
 #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
 
 static __inline__ void set_pte(pte_t *pteptr, pte_t pteval)
 {
-        unsigned long long x = ((unsigned long long) pteval.pte);
+        unsigned long long x = ((unsigned long long) pteval.pte_low);
         unsigned long long *xp = (unsigned long long *) pteptr;
         /*
          * Sign-extend based on NPHYS.
@@ -157,61 +61,6 @@ static __inline__ void pmd_set(pmd_t *pmdp,pte_t *ptep)
 #define pgd_offset_k(address) pgd_offset(&init_mm, address)
 
 /*
- * PGD level access routines.
- *
- * Note1:
- * There's no need to use physical addresses since the tree walk is all
- * in performed in software, until the PTE translation.
- *
- * Note 2:
- * A PGD entry can be uninitialized (_PGD_UNUSED), generically bad,
- * clear (_PGD_EMPTY), present. When present, lower 3 nibbles contain
- * _KERNPG_TABLE. Being a kernel virtual pointer also bit 31 must
- * be 1. Assuming an arbitrary clear value of bit 31 set to 0 and
- * lower 3 nibbles set to 0xFFF (_PGD_EMPTY) any other value is a
- * bad pgd that must be notified via printk().
- *
- */
-#define _PGD_EMPTY              0x0
-
-#if defined(CONFIG_SH64_PGTABLE_2_LEVEL)
-static inline int pgd_none(pgd_t pgd)           { return 0; }
-static inline int pgd_bad(pgd_t pgd)            { return 0; }
-#define pgd_present(pgd) ((pgd_val(pgd) & _PAGE_PRESENT) ? 1 : 0)
-#define pgd_clear(xx)                           do { } while(0)
-
-#elif defined(CONFIG_SH64_PGTABLE_3_LEVEL)
-#define pgd_present(pgd_entry)  (1)
-#define pgd_none(pgd_entry)     (pgd_val((pgd_entry)) == _PGD_EMPTY)
-/* TODO: Think later about what a useful definition of 'bad' would be now. */
-#define pgd_bad(pgd_entry)      (0)
-#define pgd_clear(pgd_entry_p)  (set_pgd((pgd_entry_p), __pgd(_PGD_EMPTY)))
-
-#endif
-
-
-#define pgd_page_vaddr(pgd_entry)       ((unsigned long) (pgd_val(pgd_entry) & PAGE_MASK))
-#define pgd_page(pgd)   (virt_to_page(pgd_val(pgd)))
-
-
-/*
- * PMD defines. Middle level.
- */
-
-/* PGD to PMD dereferencing */
-#if defined(CONFIG_SH64_PGTABLE_2_LEVEL)
-static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
-{
-        return (pmd_t *) dir;
-}
-#elif defined(CONFIG_SH64_PGTABLE_3_LEVEL)
-#define __pmd_offset(address) \
-                (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
-#define pmd_offset(dir, addr) \
-                ((pmd_t *) ((pgd_val(*(dir))) & PAGE_MASK) + __pmd_offset((addr)))
-#endif
-
-/*
  * PMD level access routines. Same notes as above.
  */
 #define _PMD_EMPTY              0x0
@@ -239,15 +88,7 @@ static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
 #define pte_unmap(pte)          do { } while (0)
 #define pte_unmap_nested(pte)   do { } while (0)
 
-/* Round it up ! */
-#define USER_PTRS_PER_PGD       ((TASK_SIZE+PGDIR_SIZE-1)/PGDIR_SIZE)
-#define FIRST_USER_ADDRESS      0
-
 #ifndef __ASSEMBLY__
-#define VMALLOC_END     0xff000000
-#define VMALLOC_START   0xf0000000
-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
-
 #define IOBASE_VADDR    0xff000000
 #define IOBASE_END      0xffffffff
 
@@ -315,43 +156,28 @@ static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
 
 #define _PAGE_CHG_MASK  (PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
 
+/*
+ * We have full permissions (Read/Write/Execute/Shared).
+ */
+#define _PAGE_COMMON    (_PAGE_PRESENT | _PAGE_USER | \
+                         _PAGE_CACHABLE | _PAGE_ACCESSED)
+
 #define PAGE_NONE       __pgprot(_PAGE_CACHABLE | _PAGE_ACCESSED)
-#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \
-                                 _PAGE_CACHABLE | _PAGE_ACCESSED | _PAGE_USER | \
+#define PAGE_SHARED     __pgprot(_PAGE_COMMON | _PAGE_READ | _PAGE_WRITE | \
                                  _PAGE_SHARED)
-/* We need to include PAGE_EXECUTE in PAGE_COPY because it is the default
- * protection mode for the stack. */
-#define PAGE_COPY       __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_CACHABLE | \
-                                 _PAGE_ACCESSED | _PAGE_USER | _PAGE_EXECUTE)
-#define PAGE_READONLY   __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_CACHABLE | \
-                                 _PAGE_ACCESSED | _PAGE_USER)
-#define PAGE_KERNEL     __pgprot(_KERNPG_TABLE)
-
+#define PAGE_EXECREAD   __pgprot(_PAGE_COMMON | _PAGE_READ | _PAGE_EXECUTE)
 
 /*
- * In ST50 we have full permissions (Read/Write/Execute/Shared).
- * Just match'em all. These are for mmap(), therefore all at least
- * User/Cachable/Present/Accessed. No point in making Fault on Write.
+ * We need to include PAGE_EXECUTE in PAGE_COPY because it is the default
+ * protection mode for the stack.
  */
-#define __MMAP_COMMON   (_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | _PAGE_ACCESSED)
-       /* sxwr */
-#define __P000  __pgprot(__MMAP_COMMON)
-#define __P001  __pgprot(__MMAP_COMMON | _PAGE_READ)
-#define __P010  __pgprot(__MMAP_COMMON)
-#define __P011  __pgprot(__MMAP_COMMON | _PAGE_READ)
-#define __P100  __pgprot(__MMAP_COMMON | _PAGE_EXECUTE)
-#define __P101  __pgprot(__MMAP_COMMON | _PAGE_EXECUTE | _PAGE_READ)
-#define __P110  __pgprot(__MMAP_COMMON | _PAGE_EXECUTE)
-#define __P111  __pgprot(__MMAP_COMMON | _PAGE_EXECUTE | _PAGE_READ)
-
-#define __S000  __pgprot(__MMAP_COMMON | _PAGE_SHARED)
-#define __S001  __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_READ)
-#define __S010  __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_WRITE)
-#define __S011  __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_READ | _PAGE_WRITE)
-#define __S100  __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_EXECUTE)
-#define __S101  __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_EXECUTE | _PAGE_READ)
-#define __S110  __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_EXECUTE | _PAGE_WRITE)
-#define __S111  __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_EXECUTE | _PAGE_READ | _PAGE_WRITE)
+#define PAGE_COPY       PAGE_EXECREAD
+
+#define PAGE_READONLY   __pgprot(_PAGE_COMMON | _PAGE_READ)
+#define PAGE_WRITEONLY  __pgprot(_PAGE_COMMON | _PAGE_WRITE)
+#define PAGE_RWX        __pgprot(_PAGE_COMMON | _PAGE_READ | \
+                                 _PAGE_WRITE | _PAGE_EXECUTE)
+#define PAGE_KERNEL     __pgprot(_KERNPG_TABLE)
 
 /* Make it a device mapping for maximum safety (e.g. for mapping device
    registers into user-space via /dev/map).  */
@@ -453,12 +279,6 @@ static inline pte_t pte_mkhuge(pte_t pte)	{ set_pte(&pte, __pte(pte_val(pte) | _
 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 { set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot))); return pte; }
 
-typedef pte_t *pte_addr_t;
-#define pgtable_cache_init()    do { } while (0)
-
-extern void update_mmu_cache(struct vm_area_struct * vma,
-                             unsigned long address, pte_t pte);
-
 /* Encode and decode a swap entry */
 #define __swp_type(x)                   (((x).val & 3) + (((x).val >> 1) & 0x3c))
 #define __swp_offset(x)                 ((x).val >> 8)
@@ -471,26 +291,9 @@ extern void update_mmu_cache(struct vm_area_struct * vma,
 #define pte_to_pgoff(pte)               (pte_val(pte))
 #define pgoff_to_pte(off)               ((pte_t) { (off) | _PAGE_FILE })
 
-/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
-#define PageSkip(page)          (0)
-#define kern_addr_valid(addr)   (1)
-
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot)         \
-                remap_pfn_range(vma, vaddr, pfn, size, prot)
-
 #endif /* !__ASSEMBLY__ */
 
-/*
- * No page table caches to initialise
- */
-#define pgtable_cache_init()    do { } while (0)
-
-#define pte_pfn(x)              (((unsigned long)((x).pte)) >> PAGE_SHIFT)
 #define pfn_pte(pfn, prot)      __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
 #define pfn_pmd(pfn, prot)      __pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
 
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-
-#include <asm-generic/pgtable.h>
-
-#endif /* __ASM_SH64_PGTABLE_H */
+#endif /* __ASM_SH_PGTABLE_64_H */
diff --git a/include/asm-sh/posix_types.h b/include/asm-sh/posix_types.h
index 0a3d2f54ab27..4b9d11c9fc77 100644
--- a/include/asm-sh/posix_types.h
+++ b/include/asm-sh/posix_types.h
@@ -1,122 +1,7 @@
-#ifndef __ASM_SH_POSIX_TYPES_H
-#define __ASM_SH_POSIX_TYPES_H
-
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned long   __kernel_ino_t;
-typedef unsigned short  __kernel_mode_t;
-typedef unsigned short  __kernel_nlink_t;
-typedef long            __kernel_off_t;
-typedef int             __kernel_pid_t;
-typedef unsigned short  __kernel_ipc_pid_t;
-typedef unsigned short  __kernel_uid_t;
-typedef unsigned short  __kernel_gid_t;
-typedef unsigned int    __kernel_size_t;
-typedef int             __kernel_ssize_t;
-typedef int             __kernel_ptrdiff_t;
-typedef long            __kernel_time_t;
-typedef long            __kernel_suseconds_t;
-typedef long            __kernel_clock_t;
-typedef int             __kernel_timer_t;
-typedef int             __kernel_clockid_t;
-typedef int             __kernel_daddr_t;
-typedef char *          __kernel_caddr_t;
-typedef unsigned short  __kernel_uid16_t;
-typedef unsigned short  __kernel_gid16_t;
-typedef unsigned int    __kernel_uid32_t;
-typedef unsigned int    __kernel_gid32_t;
-
-typedef unsigned short  __kernel_old_uid_t;
-typedef unsigned short  __kernel_old_gid_t;
-typedef unsigned short  __kernel_old_dev_t;
-
-#ifdef __GNUC__
-typedef long long       __kernel_loff_t;
-#endif
-
-typedef struct {
-#if defined(__KERNEL__) || defined(__USE_ALL)
-        int     val[2];
-#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-        int     __val[2];
-#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-} __kernel_fsid_t;
-
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
-
-#undef  __FD_SET
-static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)
-{
-        unsigned long __tmp = __fd / __NFDBITS;
-        unsigned long __rem = __fd % __NFDBITS;
-        __fdsetp->fds_bits[__tmp] |= (1UL<<__rem);
-}
-
-#undef  __FD_CLR
-static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)
-{
-        unsigned long __tmp = __fd / __NFDBITS;
-        unsigned long __rem = __fd % __NFDBITS;
-        __fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);
-}
-
-
-#undef  __FD_ISSET
-static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)
-{ 
-        unsigned long __tmp = __fd / __NFDBITS;
-        unsigned long __rem = __fd % __NFDBITS;
-        return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;
-}
-
-/*
- * This will unroll the loop for the normal constant case (8 ints,
- * for a 256-bit fd_set)
- */
-#undef  __FD_ZERO
-static __inline__ void __FD_ZERO(__kernel_fd_set *__p)
-{
-        unsigned long *__tmp = __p->fds_bits;
-        int __i;
-
-        if (__builtin_constant_p(__FDSET_LONGS)) {
-                switch (__FDSET_LONGS) {
-                case 16:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        __tmp[ 4] = 0; __tmp[ 5] = 0;
-                        __tmp[ 6] = 0; __tmp[ 7] = 0;
-                        __tmp[ 8] = 0; __tmp[ 9] = 0;
-                        __tmp[10] = 0; __tmp[11] = 0;
-                        __tmp[12] = 0; __tmp[13] = 0;
-                        __tmp[14] = 0; __tmp[15] = 0;
-                        return;
-
-                case 8:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        __tmp[ 4] = 0; __tmp[ 5] = 0;
-                        __tmp[ 6] = 0; __tmp[ 7] = 0;
-                        return;
-
-                case 4:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        return;
-                }
-        }
-        __i = __FDSET_LONGS;
-        while (__i) {
-                __i--;
-                *__tmp = 0;
-                __tmp++;
-        }
-}
-
-#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
-
-#endif /* __ASM_SH_POSIX_TYPES_H */
+#ifdef __KERNEL__
+# ifdef CONFIG_SUPERH32
+#  include "posix_types_32.h"
+# else
+#  include "posix_types_64.h"
+# endif
+#endif /* __KERNEL__ */
diff --git a/include/asm-sh/posix_types_32.h b/include/asm-sh/posix_types_32.h
new file mode 100644
index 000000000000..0a3d2f54ab27
--- /dev/null
+++ b/include/asm-sh/posix_types_32.h
@@ -0,0 +1,122 @@
+#ifndef __ASM_SH_POSIX_TYPES_H
+#define __ASM_SH_POSIX_TYPES_H
+
+/*
+ * This file is generally used by user-level software, so you need to
+ * be a little careful about namespace pollution etc.  Also, we cannot
+ * assume GCC is being used.
+ */
+
+typedef unsigned long   __kernel_ino_t;
+typedef unsigned short  __kernel_mode_t;
+typedef unsigned short  __kernel_nlink_t;
+typedef long            __kernel_off_t;
+typedef int             __kernel_pid_t;
+typedef unsigned short  __kernel_ipc_pid_t;
+typedef unsigned short  __kernel_uid_t;
+typedef unsigned short  __kernel_gid_t;
+typedef unsigned int    __kernel_size_t;
+typedef int             __kernel_ssize_t;
+typedef int             __kernel_ptrdiff_t;
+typedef long            __kernel_time_t;
+typedef long            __kernel_suseconds_t;
+typedef long            __kernel_clock_t;
+typedef int             __kernel_timer_t;
+typedef int             __kernel_clockid_t;
+typedef int             __kernel_daddr_t;
+typedef char *          __kernel_caddr_t;
+typedef unsigned short  __kernel_uid16_t;
+typedef unsigned short  __kernel_gid16_t;
+typedef unsigned int    __kernel_uid32_t;
+typedef unsigned int    __kernel_gid32_t;
+
+typedef unsigned short  __kernel_old_uid_t;
+typedef unsigned short  __kernel_old_gid_t;
+typedef unsigned short  __kernel_old_dev_t;
+
+#ifdef __GNUC__
+typedef long long       __kernel_loff_t;
+#endif
+
+typedef struct {
+#if defined(__KERNEL__) || defined(__USE_ALL)
+        int     val[2];
+#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
+        int     __val[2];
+#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
+} __kernel_fsid_t;
+
+#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+
+#undef  __FD_SET
+static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)
+{
+        unsigned long __tmp = __fd / __NFDBITS;
+        unsigned long __rem = __fd % __NFDBITS;
+        __fdsetp->fds_bits[__tmp] |= (1UL<<__rem);
+}
+
+#undef  __FD_CLR
+static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)
+{
+        unsigned long __tmp = __fd / __NFDBITS;
+        unsigned long __rem = __fd % __NFDBITS;
+        __fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);
+}
+
+
+#undef  __FD_ISSET
+static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)
+{ 
+        unsigned long __tmp = __fd / __NFDBITS;
+        unsigned long __rem = __fd % __NFDBITS;
+        return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;
+}
+
+/*
+ * This will unroll the loop for the normal constant case (8 ints,
+ * for a 256-bit fd_set)
+ */
+#undef  __FD_ZERO
+static __inline__ void __FD_ZERO(__kernel_fd_set *__p)
+{
+        unsigned long *__tmp = __p->fds_bits;
+        int __i;
+
+        if (__builtin_constant_p(__FDSET_LONGS)) {
+                switch (__FDSET_LONGS) {
+                case 16:
+                        __tmp[ 0] = 0; __tmp[ 1] = 0;
+                        __tmp[ 2] = 0; __tmp[ 3] = 0;
+                        __tmp[ 4] = 0; __tmp[ 5] = 0;
+                        __tmp[ 6] = 0; __tmp[ 7] = 0;
+                        __tmp[ 8] = 0; __tmp[ 9] = 0;
+                        __tmp[10] = 0; __tmp[11] = 0;
+                        __tmp[12] = 0; __tmp[13] = 0;
+                        __tmp[14] = 0; __tmp[15] = 0;
+                        return;
+
+                case 8:
+                        __tmp[ 0] = 0; __tmp[ 1] = 0;
+                        __tmp[ 2] = 0; __tmp[ 3] = 0;
+                        __tmp[ 4] = 0; __tmp[ 5] = 0;
+                        __tmp[ 6] = 0; __tmp[ 7] = 0;
+                        return;
+
+                case 4:
+                        __tmp[ 0] = 0; __tmp[ 1] = 0;
+                        __tmp[ 2] = 0; __tmp[ 3] = 0;
+                        return;
+                }
+        }
+        __i = __FDSET_LONGS;
+        while (__i) {
+                __i--;
+                *__tmp = 0;
+                __tmp++;
+        }
+}
+
+#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
+
+#endif /* __ASM_SH_POSIX_TYPES_H */
diff --git a/include/asm-sh64/posix_types.h b/include/asm-sh/posix_types_64.h
index 0620317a6f0f..0620317a6f0f 100644
--- a/include/asm-sh64/posix_types.h
+++ b/include/asm-sh/posix_types_64.h
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index fda68480f377..c9b14161f73d 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -1,32 +1,10 @@
-/*
- * include/asm-sh/processor.h
- *
- * Copyright (C) 1999, 2000  Niibe Yutaka
- * Copyright (C) 2002, 2003  Paul Mundt
- */
-
 #ifndef __ASM_SH_PROCESSOR_H
 #define __ASM_SH_PROCESSOR_H
-#ifdef __KERNEL__
 
-#include <linux/compiler.h>
-#include <asm/page.h>
-#include <asm/types.h>
-#include <asm/cache.h>
-#include <asm/ptrace.h>
 #include <asm/cpu-features.h>
+#include <asm/fpu.h>
 
-/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr() ({ void *pc; __asm__("mova  1f, %0\n1:":"=z" (pc)); pc; })
-
-/* Core Processor Version Register */
-#define CCN_PVR         0xff000030
-#define CCN_CVR         0xff000040
-#define CCN_PRR         0xff000044
-
+#ifndef __ASSEMBLY__
 /*
  *  CPU type and hardware bug flags. Kept separately for each CPU.
  *
@@ -39,247 +17,49 @@ enum cpu_type {
         CPU_SH7619,
 
         /* SH-2A types */
-        CPU_SH7206,
+        CPU_SH7203, CPU_SH7206, CPU_SH7263,
 
         /* SH-3 types */
         CPU_SH7705, CPU_SH7706, CPU_SH7707,
         CPU_SH7708, CPU_SH7708S, CPU_SH7708R,
         CPU_SH7709, CPU_SH7709A, CPU_SH7710, CPU_SH7712,
-        CPU_SH7720, CPU_SH7729,
+        CPU_SH7720, CPU_SH7721, CPU_SH7729,
 
         /* SH-4 types */
         CPU_SH7750, CPU_SH7750S, CPU_SH7750R, CPU_SH7751, CPU_SH7751R,
         CPU_SH7760, CPU_SH4_202, CPU_SH4_501,
 
         /* SH-4A types */
-        CPU_SH7770, CPU_SH7780, CPU_SH7781, CPU_SH7785, CPU_SHX3,
+        CPU_SH7763, CPU_SH7770, CPU_SH7780, CPU_SH7781, CPU_SH7785, CPU_SHX3,
 
         /* SH4AL-DSP types */
         CPU_SH7343, CPU_SH7722,
 
+        /* SH-5 types */
+        CPU_SH5_101, CPU_SH5_103,
+
         /* Unknown subtype */
         CPU_SH_NONE
 };
 
-struct sh_cpuinfo {
-        unsigned int type;
-        unsigned long loops_per_jiffy;
-        unsigned long asid_cache;
-
-        struct cache_info icache;       /* Primary I-cache */
-        struct cache_info dcache;       /* Primary D-cache */
-        struct cache_info scache;       /* Secondary cache */
-
-        unsigned long flags;
-} __attribute__ ((aligned(L1_CACHE_BYTES)));
-
-extern struct sh_cpuinfo cpu_data[];
-#define boot_cpu_data cpu_data[0]
-#define current_cpu_data cpu_data[smp_processor_id()]
-#define raw_current_cpu_data cpu_data[raw_smp_processor_id()]
-
-/*
- * User space process size: 2GB.
- *
- * Since SH7709 and SH7750 have "area 7", we can't use 0x7c000000--0x7fffffff
- */
-#define TASK_SIZE       0x7c000000UL
-
-/* This decides where the kernel will search for a free chunk of vm
- * space during mmap's.
- */
-#define TASK_UNMAPPED_BASE      (TASK_SIZE / 3)
-
-/*
- * Bit of SR register
- *
- * FD-bit:
- *     When it's set, it means the processor doesn't have right to use FPU,
- *     and it results exception when the floating operation is executed.
- *
- * IMASK-bit:
- *     Interrupt level mask
- */
-#define SR_FD           0x00008000
-#define SR_DSP          0x00001000
-#define SR_IMASK        0x000000f0
-
-/*
- * FPU structure and data
- */
-
-struct sh_fpu_hard_struct {
-        unsigned long fp_regs[16];
-        unsigned long xfp_regs[16];
-        unsigned long fpscr;
-        unsigned long fpul;
-
-        long status; /* software status information */
-};
-
-/* Dummy fpu emulator  */
-struct sh_fpu_soft_struct {
-        unsigned long fp_regs[16];
-        unsigned long xfp_regs[16];
-        unsigned long fpscr;
-        unsigned long fpul;
-
-        unsigned char lookahead;
-        unsigned long entry_pc;
-};
-
-union sh_fpu_union {
-        struct sh_fpu_hard_struct hard;
-        struct sh_fpu_soft_struct soft;
-};
-
-struct thread_struct {
-        /* Saved registers when thread is descheduled */
-        unsigned long sp;
-        unsigned long pc;
-
-        /* Hardware debugging registers */
-        unsigned long ubc_pc;
-
-        /* floating point info */
-        union sh_fpu_union fpu;
-};
-
-typedef struct {
-        unsigned long seg;
-} mm_segment_t;
-
-/* Count of active tasks with UBC settings */
-extern int ubc_usercnt;
+/* Forward decl */
+struct sh_cpuinfo;
 
-#define INIT_THREAD  {                                          \
-        .sp = sizeof(init_stack) + (long) &init_stack,          \
-}
-
-/*
- * Do necessary setup to start up a newly executed thread.
- */
-#define start_thread(regs, new_pc, new_sp)       \
-        set_fs(USER_DS);                         \
-        regs->pr = 0;                            \
-        regs->sr = SR_FD;       /* User mode. */ \
-        regs->pc = new_pc;                       \
-        regs->regs[15] = new_sp
-
-/* Forward declaration, a strange C thing */
-struct task_struct;
-struct mm_struct;
-
-/* Free all resources held by a thread. */
-extern void release_thread(struct task_struct *);
-
-/* Prepare to copy thread state - unlazy all lazy status */
-#define prepare_to_copy(tsk)    do { } while (0)
-
-/*
- * create a kernel thread without removing it from tasklists
- */
-extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
-
-/* Copy and release all segment info associated with a VM */
-#define copy_segments(p, mm)    do { } while(0)
-#define release_segments(mm)    do { } while(0)
-
-/*
- * FPU lazy state save handling.
- */
-
-static __inline__ void disable_fpu(void)
-{
-        unsigned long __dummy;
-
-        /* Set FD flag in SR */
-        __asm__ __volatile__("stc       sr, %0\n\t"
-                             "or        %1, %0\n\t"
-                             "ldc       %0, sr"
-                             : "=&r" (__dummy)
-                             : "r" (SR_FD));
-}
-
-static __inline__ void enable_fpu(void)
-{
-        unsigned long __dummy;
-
-        /* Clear out FD flag in SR */
-        __asm__ __volatile__("stc       sr, %0\n\t"
-                             "and       %1, %0\n\t"
-                             "ldc       %0, sr"
-                             : "=&r" (__dummy)
-                             : "r" (~SR_FD));
-}
-
-static __inline__ void release_fpu(struct pt_regs *regs)
-{
-        regs->sr |= SR_FD;
-}
-
-static __inline__ void grab_fpu(struct pt_regs *regs)
-{
-        regs->sr &= ~SR_FD;
-}
-
-extern void save_fpu(struct task_struct *__tsk, struct pt_regs *regs);
-
-#define unlazy_fpu(tsk, regs) do {                      \
-        if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) {   \
-                save_fpu(tsk, regs);                    \
-        }                                               \
-} while (0)
-
-#define clear_fpu(tsk, regs) do {                               \
-        if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) {           \
-                clear_tsk_thread_flag(tsk, TIF_USEDFPU);        \
-                release_fpu(regs);                              \
-        }                                                       \
-} while (0)
-
-/* Double presision, NANS as NANS, rounding to nearest, no exceptions */
-#define FPSCR_INIT  0x00080000
-
-#define FPSCR_CAUSE_MASK        0x0001f000      /* Cause bits */
-#define FPSCR_FLAG_MASK         0x0000007c      /* Flag bits */
-
-/*
- * Return saved PC of a blocked thread.
- */
-#define thread_saved_pc(tsk)    (tsk->thread.pc)
-
-void show_trace(struct task_struct *tsk, unsigned long *sp,
-                struct pt_regs *regs);
-extern unsigned long get_wchan(struct task_struct *p);
-
-#define KSTK_EIP(tsk)  (task_pt_regs(tsk)->pc)
-#define KSTK_ESP(tsk)  (task_pt_regs(tsk)->regs[15])
-
-#define cpu_sleep()     __asm__ __volatile__ ("sleep" : : : "memory")
-#define cpu_relax()     barrier()
-
-#if defined(CONFIG_CPU_SH2A) || defined(CONFIG_CPU_SH3) || \
-    defined(CONFIG_CPU_SH4)
-#define PREFETCH_STRIDE         L1_CACHE_BYTES
-#define ARCH_HAS_PREFETCH
-#define ARCH_HAS_PREFETCHW
-static inline void prefetch(void *x)
-{
-        __asm__ __volatile__ ("pref @%0\n\t" : : "r" (x) : "memory");
-}
-
-#define prefetchw(x)    prefetch(x)
-#endif
+/* arch/sh/kernel/setup.c */
+const char *get_cpu_subtype(struct sh_cpuinfo *c);
 
 #ifdef CONFIG_VSYSCALL
-extern int vsyscall_init(void);
+int vsyscall_init(void);
 #else
 #define vsyscall_init() do { } while (0)
 #endif
 
-/* arch/sh/kernel/setup.c */
-const char *get_cpu_subtype(struct sh_cpuinfo *c);
+#endif /* __ASSEMBLY__ */
+
+#ifdef CONFIG_SUPERH32
+# include "processor_32.h"
+#else
+# include "processor_64.h"
+#endif
 
-#endif /* __KERNEL__ */
 #endif /* __ASM_SH_PROCESSOR_H */
diff --git a/include/asm-sh/processor_32.h b/include/asm-sh/processor_32.h
new file mode 100644
index 000000000000..a7edaa1a870c
--- /dev/null
+++ b/include/asm-sh/processor_32.h
@@ -0,0 +1,215 @@
+/*
+ * include/asm-sh/processor.h
+ *
+ * Copyright (C) 1999, 2000  Niibe Yutaka
+ * Copyright (C) 2002, 2003  Paul Mundt
+ */
+
+#ifndef __ASM_SH_PROCESSOR_32_H
+#define __ASM_SH_PROCESSOR_32_H
+#ifdef __KERNEL__
+
+#include <linux/compiler.h>
+#include <asm/page.h>
+#include <asm/types.h>
+#include <asm/cache.h>
+#include <asm/ptrace.h>
+
+/*
+ * Default implementation of macro that returns current
+ * instruction pointer ("program counter").
+ */
+#define current_text_addr() ({ void *pc; __asm__("mova  1f, %0\n1:":"=z" (pc)); pc; })
+
+/* Core Processor Version Register */
+#define CCN_PVR         0xff000030
+#define CCN_CVR         0xff000040
+#define CCN_PRR         0xff000044
+
+struct sh_cpuinfo {
+        unsigned int type;
+        unsigned long loops_per_jiffy;
+        unsigned long asid_cache;
+
+        struct cache_info icache;       /* Primary I-cache */
+        struct cache_info dcache;       /* Primary D-cache */
+        struct cache_info scache;       /* Secondary cache */
+
+        unsigned long flags;
+} __attribute__ ((aligned(L1_CACHE_BYTES)));
+
+extern struct sh_cpuinfo cpu_data[];
+#define boot_cpu_data cpu_data[0]
+#define current_cpu_data cpu_data[smp_processor_id()]
+#define raw_current_cpu_data cpu_data[raw_smp_processor_id()]
+
+/*
+ * User space process size: 2GB.
+ *
+ * Since SH7709 and SH7750 have "area 7", we can't use 0x7c000000--0x7fffffff
+ */
+#define TASK_SIZE       0x7c000000UL
+
+/* This decides where the kernel will search for a free chunk of vm
+ * space during mmap's.
+ */
+#define TASK_UNMAPPED_BASE      (TASK_SIZE / 3)
+
+/*
+ * Bit of SR register
+ *
+ * FD-bit:
+ *     When it's set, it means the processor doesn't have right to use FPU,
+ *     and it results exception when the floating operation is executed.
+ *
+ * IMASK-bit:
+ *     Interrupt level mask
+ */
+#define SR_DSP          0x00001000
+#define SR_IMASK        0x000000f0
+
+/*
+ * FPU structure and data
+ */
+
+struct sh_fpu_hard_struct {
+        unsigned long fp_regs[16];
+        unsigned long xfp_regs[16];
+        unsigned long fpscr;
+        unsigned long fpul;
+
+        long status; /* software status information */
+};
+
+/* Dummy fpu emulator  */
+struct sh_fpu_soft_struct {
+        unsigned long fp_regs[16];
+        unsigned long xfp_regs[16];
+        unsigned long fpscr;
+        unsigned long fpul;
+
+        unsigned char lookahead;
+        unsigned long entry_pc;
+};
+
+union sh_fpu_union {
+        struct sh_fpu_hard_struct hard;
+        struct sh_fpu_soft_struct soft;
+};
+
+struct thread_struct {
+        /* Saved registers when thread is descheduled */
+        unsigned long sp;
+        unsigned long pc;
+
+        /* Hardware debugging registers */
+        unsigned long ubc_pc;
+
+        /* floating point info */
+        union sh_fpu_union fpu;
+};
+
+typedef struct {
+        unsigned long seg;
+} mm_segment_t;
+
+/* Count of active tasks with UBC settings */
+extern int ubc_usercnt;
+
+#define INIT_THREAD  {                                          \
+        .sp = sizeof(init_stack) + (long) &init_stack,          \
+}
+
+/*
+ * Do necessary setup to start up a newly executed thread.
+ */
+#define start_thread(regs, new_pc, new_sp)       \
+        set_fs(USER_DS);                         \
+        regs->pr = 0;                            \
+        regs->sr = SR_FD;       /* User mode. */ \
+        regs->pc = new_pc;                       \
+        regs->regs[15] = new_sp
+
+/* Forward declaration, a strange C thing */
+struct task_struct;
+struct mm_struct;
+
+/* Free all resources held by a thread. */
+extern void release_thread(struct task_struct *);
+
+/* Prepare to copy thread state - unlazy all lazy status */
+#define prepare_to_copy(tsk)    do { } while (0)
+
+/*
+ * create a kernel thread without removing it from tasklists
+ */
+extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
+
+/* Copy and release all segment info associated with a VM */
+#define copy_segments(p, mm)    do { } while(0)
+#define release_segments(mm)    do { } while(0)
+
+/*
+ * FPU lazy state save handling.
+ */
+
+static __inline__ void disable_fpu(void)
+{
+        unsigned long __dummy;
+
+        /* Set FD flag in SR */
+        __asm__ __volatile__("stc       sr, %0\n\t"
+                             "or        %1, %0\n\t"
+                             "ldc       %0, sr"
+                             : "=&r" (__dummy)
+                             : "r" (SR_FD));
+}
+
+static __inline__ void enable_fpu(void)
+{
+        unsigned long __dummy;
+
+        /* Clear out FD flag in SR */
+        __asm__ __volatile__("stc       sr, %0\n\t"
+                             "and       %1, %0\n\t"
+                             "ldc       %0, sr"
+                             : "=&r" (__dummy)
+                             : "r" (~SR_FD));
+}
+
+/* Double presision, NANS as NANS, rounding to nearest, no exceptions */
+#define FPSCR_INIT  0x00080000
+
+#define FPSCR_CAUSE_MASK        0x0001f000      /* Cause bits */
+#define FPSCR_FLAG_MASK         0x0000007c      /* Flag bits */
+
+/*
+ * Return saved PC of a blocked thread.
+ */
+#define thread_saved_pc(tsk)    (tsk->thread.pc)
+
+void show_trace(struct task_struct *tsk, unsigned long *sp,
+                struct pt_regs *regs);
+extern unsigned long get_wchan(struct task_struct *p);
+
+#define KSTK_EIP(tsk)  (task_pt_regs(tsk)->pc)
+#define KSTK_ESP(tsk)  (task_pt_regs(tsk)->regs[15])
+
+#define cpu_sleep()     __asm__ __volatile__ ("sleep" : : : "memory")
+#define cpu_relax()     barrier()
+
+#if defined(CONFIG_CPU_SH2A) || defined(CONFIG_CPU_SH3) || \
+    defined(CONFIG_CPU_SH4)
+#define PREFETCH_STRIDE         L1_CACHE_BYTES
+#define ARCH_HAS_PREFETCH
+#define ARCH_HAS_PREFETCHW
+static inline void prefetch(void *x)
+{
+        __asm__ __volatile__ ("pref @%0\n\t" : : "r" (x) : "memory");
+}
+
+#define prefetchw(x)    prefetch(x)
+#endif
+
+#endif /* __KERNEL__ */
+#endif /* __ASM_SH_PROCESSOR_32_H */
diff --git a/include/asm-sh64/processor.h b/include/asm-sh/processor_64.h
index eb2bee4b47b9..99c22b14a85b 100644
--- a/include/asm-sh64/processor.h
+++ b/include/asm-sh/processor_64.h
@@ -1,28 +1,25 @@
-#ifndef __ASM_SH64_PROCESSOR_H
-#define __ASM_SH64_PROCESSOR_H
+#ifndef __ASM_SH_PROCESSOR_64_H
+#define __ASM_SH_PROCESSOR_64_H
 
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/processor.h
+ * include/asm-sh/processor_64.h
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003  Paul Mundt
  * Copyright (C) 2004  Richard Curnow
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
-#include <asm/page.h>
-
 #ifndef __ASSEMBLY__
 
+#include <linux/compiler.h>
+#include <asm/page.h>
 #include <asm/types.h>
 #include <asm/cache.h>
-#include <asm/registers.h>
-#include <linux/threads.h>
-#include <linux/compiler.h>
+#include <asm/ptrace.h>
+#include <asm/cpu/registers.h>
 
 /*
  * Default implementation of macro that returns current
@@ -40,15 +37,6 @@ __asm__("gettr	tr0, %1\n\t" \
 pc; })
 
 /*
- *  CPU type and hardware bug flags. Kept separately for each CPU.
- */
-enum cpu_type {
-        CPU_SH5_101,
-        CPU_SH5_103,
-        CPU_SH_NONE
-};
-
-/*
  * TLB information structure
  *
  * Defined for both I and D tlb, per-processor.
@@ -67,28 +55,26 @@ struct tlb_info {
 struct sh_cpuinfo {
         enum cpu_type type;
         unsigned long loops_per_jiffy;
+        unsigned long asid_cache;
 
-        char    hard_math;
-
-        unsigned long *pgd_quick;
-        unsigned long *pmd_quick;
-        unsigned long *pte_quick;
-        unsigned long pgtable_cache_sz;
         unsigned int cpu_clock, master_clock, bus_clock, module_clock;
 
         /* Cache info */
         struct cache_info icache;
         struct cache_info dcache;
+        struct cache_info scache;
 
         /* TLB info */
         struct tlb_info itlb;
         struct tlb_info dtlb;
-};
 
-extern struct sh_cpuinfo boot_cpu_data;
+        unsigned long flags;
+};
 
-#define cpu_data (&boot_cpu_data)
-#define current_cpu_data boot_cpu_data
+extern struct sh_cpuinfo cpu_data[];
+#define boot_cpu_data cpu_data[0]
+#define current_cpu_data cpu_data[smp_processor_id()]
+#define raw_current_cpu_data cpu_data[raw_smp_processor_id()]
 
 #endif
 
@@ -116,8 +102,6 @@ extern struct sh_cpuinfo boot_cpu_data;
  *     Single step bit
  *
  */
-#define SR_FD    0x00008000
-
 #if defined(CONFIG_SH64_SR_WATCH)
 #define SR_MMU   0x84000000
 #else
@@ -178,6 +162,10 @@ struct thread_struct {
         union sh_fpu_union fpu;
 };
 
+typedef struct {
+        unsigned long seg;
+} mm_segment_t;
+
 #define INIT_MMAP \
 { &init_mm, 0, 0, NULL, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL }
 
@@ -200,12 +188,12 @@ extern  struct pt_regs fake_swapper_regs;
  */
 #define SR_USER (SR_MMU | SR_FD)
 
-#define start_thread(regs, new_pc, new_sp)                      \
-        set_fs(USER_DS);                                        \
-        regs->sr = SR_USER;     /* User mode. */                \
+#define start_thread(regs, new_pc, new_sp)                      \
+        set_fs(USER_DS);                                        \
+        regs->sr = SR_USER;     /* User mode. */                \
         regs->pc = new_pc - 4;  /* Compensate syscall exit */   \
         regs->pc |= 1;          /* Set SHmedia ! */             \
-        regs->regs[18] = 0;                                     \
+        regs->regs[18] = 0;                                     \
         regs->regs[15] = new_sp
 
 /* Forward declaration, a strange C thing */
@@ -229,7 +217,7 @@ extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
  * FPU lazy state save handling.
  */
 
-static inline void release_fpu(void)
+static inline void disable_fpu(void)
 {
         unsigned long long __dummy;
 
@@ -241,7 +229,7 @@ static inline void release_fpu(void)
                              : "r" (SR_FD));
 }
 
-static inline void grab_fpu(void)
+static inline void enable_fpu(void)
 {
         unsigned long long __dummy;
 
@@ -262,11 +250,12 @@ static inline void grab_fpu(void)
 #define FPSCR_INIT  0x00000000
 #endif
 
-/* Save the current FP regs */
-void fpsave(struct sh_fpu_hard_struct *fpregs);
-
+#ifdef CONFIG_SH_FPU
 /* Initialise the FP state of a task */
 void fpinit(struct sh_fpu_hard_struct *fpregs);
+#else
+#define fpinit(fpregs)  do { } while (0)
+#endif
 
 extern struct task_struct *last_task_used_math;
 
@@ -283,5 +272,4 @@ extern unsigned long get_wchan(struct task_struct *p);
 #define cpu_relax()     barrier()
 
 #endif  /* __ASSEMBLY__ */
-#endif /* __ASM_SH64_PROCESSOR_H */
-
+#endif /* __ASM_SH_PROCESSOR_64_H */
diff --git a/include/asm-sh/ptrace.h b/include/asm-sh/ptrace.h
index b9789c8b4d15..8d6c92b3e770 100644
--- a/include/asm-sh/ptrace.h
+++ b/include/asm-sh/ptrace.h
@@ -5,7 +5,16 @@
  * Copyright (C) 1999, 2000  Niibe Yutaka
  *
  */
-
+#if defined(__SH5__) || defined(CONFIG_SUPERH64)
+struct pt_regs {
+        unsigned long long pc;
+        unsigned long long sr;
+        unsigned long long syscall_nr;
+        unsigned long long regs[63];
+        unsigned long long tregs[8];
+        unsigned long long pad[2];
+};
+#else
 /*
  * GCC defines register number like this:
  * -----------------------------
@@ -28,7 +37,7 @@
 
 #define REG_PR          17
 #define REG_SR          18
-#define REG_GBR         19
+#define REG_GBR         19
 #define REG_MACH        20
 #define REG_MACL        21
 
@@ -80,10 +89,14 @@ struct pt_dspregs {
 
 #define PTRACE_GETDSPREGS       55
 #define PTRACE_SETDSPREGS       56
+#endif
 
 #ifdef __KERNEL__
-#define user_mode(regs) (((regs)->sr & 0x40000000)==0)
-#define instruction_pointer(regs) ((regs)->pc)
+#include <asm/addrspace.h>
+
+#define user_mode(regs)                 (((regs)->sr & 0x40000000)==0)
+#define instruction_pointer(regs)       ((unsigned long)(regs)->pc)
+
 extern void show_regs(struct pt_regs *);
 
 #ifdef CONFIG_SH_DSP
@@ -100,10 +113,13 @@ static inline unsigned long profile_pc(struct pt_regs *regs)
 {
         unsigned long pc = instruction_pointer(regs);
 
-        if (pc >= 0xa0000000UL && pc < 0xc0000000UL)
+#ifdef P2SEG
+        if (pc >= P2SEG && pc < P3SEG)
                 pc -= 0x20000000;
+#endif
+
         return pc;
 }
-#endif
+#endif /* __KERNEL__ */
 
 #endif /* __ASM_SH_PTRACE_H */
diff --git a/include/asm-sh/r7780rp.h b/include/asm-sh/r7780rp.h
index de37f933aa42..bdecea0840a0 100644
--- a/include/asm-sh/r7780rp.h
+++ b/include/asm-sh/r7780rp.h
@@ -121,21 +121,6 @@
 
 #define IRLCNTR1        (PA_BCR + 0)    /* Interrupt Control Register1 */
 
-#define IRQ_PCISLOT1    0               /* PCI Slot #1 IRQ */
-#define IRQ_PCISLOT2    1               /* PCI Slot #2 IRQ */
-#define IRQ_PCISLOT3    2               /* PCI Slot #3 IRQ */
-#define IRQ_PCISLOT4    3               /* PCI Slot #4 IRQ */
-#define IRQ_CFINST      5               /* CF Card Insert IRQ */
-#define IRQ_M66596      6               /* M66596 IRQ */
-#define IRQ_SDCARD      7               /* SD Card IRQ */
-#define IRQ_TUCHPANEL   8               /* Touch Panel IRQ */
-#define IRQ_SCI         9               /* SCI IRQ */
-#define IRQ_2SERIAL     10              /* Serial IRQ */
-#define IRQ_EXTENTION   11              /* EXTn IRQ */
-#define IRQ_ONETH       12              /* On board Ethernet IRQ */
-#define IRQ_PSW         13              /* Push Switch IRQ */
-#define IRQ_ZIGBEE      14              /* Ziggbee IO IRQ */
-
 #define IVDR_CK_ON      8               /* iVDR Clock ON */
 
 #elif defined(CONFIG_SH_R7785RP)
@@ -192,13 +177,19 @@
 
 #define IRQ_AX88796             (HL_FPGA_IRQ_BASE + 0)
 #define IRQ_CF                  (HL_FPGA_IRQ_BASE + 1)
-#ifndef IRQ_PSW
 #define IRQ_PSW                 (HL_FPGA_IRQ_BASE + 2)
-#endif
-#define IRQ_EXT1                (HL_FPGA_IRQ_BASE + 3)
-#define IRQ_EXT4                (HL_FPGA_IRQ_BASE + 4)
-
-void make_r7780rp_irq(unsigned int irq);
+#define IRQ_EXT0                (HL_FPGA_IRQ_BASE + 3)
+#define IRQ_EXT1                (HL_FPGA_IRQ_BASE + 4)
+#define IRQ_EXT2                (HL_FPGA_IRQ_BASE + 5)
+#define IRQ_EXT3                (HL_FPGA_IRQ_BASE + 6)
+#define IRQ_EXT4                (HL_FPGA_IRQ_BASE + 7)
+#define IRQ_EXT5                (HL_FPGA_IRQ_BASE + 8)
+#define IRQ_EXT6                (HL_FPGA_IRQ_BASE + 9)
+#define IRQ_EXT7                (HL_FPGA_IRQ_BASE + 10)
+#define IRQ_SMBUS               (HL_FPGA_IRQ_BASE + 11)
+#define IRQ_TP                  (HL_FPGA_IRQ_BASE + 12)
+#define IRQ_RTC                 (HL_FPGA_IRQ_BASE + 13)
+#define IRQ_TH_ALERT            (HL_FPGA_IRQ_BASE + 14)
 
 unsigned char *highlander_init_irq_r7780mp(void);
 unsigned char *highlander_init_irq_r7780rp(void);
diff --git a/include/asm-sh/rtc.h b/include/asm-sh/rtc.h
index 858da99d37e0..ec45ba8e11d9 100644
--- a/include/asm-sh/rtc.h
+++ b/include/asm-sh/rtc.h
@@ -11,4 +11,6 @@ struct sh_rtc_platform_info {
         unsigned long capabilities;
 };
 
+#include <asm/cpu/rtc.h>
+
 #endif /* _ASM_RTC_H */
diff --git a/include/asm-sh/scatterlist.h b/include/asm-sh/scatterlist.h
index a7d0d1856a99..2084d0373693 100644
--- a/include/asm-sh/scatterlist.h
+++ b/include/asm-sh/scatterlist.h
@@ -13,7 +13,7 @@ struct scatterlist {
     unsigned int length;
 };
 
-#define ISA_DMA_THRESHOLD (0x1fffffff)
+#define ISA_DMA_THRESHOLD       PHYS_ADDR_MASK
 
 /* These macros should be used after a pci_map_sg call has been done
  * to get bus addresses of each of the SG entries and their lengths.
diff --git a/include/asm-sh/sdk7780.h b/include/asm-sh/sdk7780.h
new file mode 100644
index 000000000000..697dc865f21b
--- /dev/null
+++ b/include/asm-sh/sdk7780.h
@@ -0,0 +1,81 @@
+#ifndef __ASM_SH_RENESAS_SDK7780_H
+#define __ASM_SH_RENESAS_SDK7780_H
+
+/*
+ * linux/include/asm-sh/sdk7780.h
+ *
+ * Renesas Solutions SH7780 SDK Support
+ * Copyright (C) 2008 Nicholas Beck <nbeck@mpc-data.co.uk>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <asm/addrspace.h>
+
+/* Box specific addresses.  */
+#define SE_AREA0_WIDTH  4               /* Area0: 32bit */
+#define PA_ROM                  0xa0000000      /* EPROM */
+#define PA_ROM_SIZE             0x00400000      /* EPROM size 4M byte */
+#define PA_FROM                 0xa0800000      /* Flash-ROM */
+#define PA_FROM_SIZE    0x00400000      /* Flash-ROM size 4M byte */
+#define PA_EXT1                 0xa4000000
+#define PA_EXT1_SIZE    0x04000000
+#define PA_SDRAM                0xa8000000      /* DDR-SDRAM(Area2/3) 128MB */
+#define PA_SDRAM_SIZE   0x08000000
+
+#define PA_EXT4                 0xb0000000
+#define PA_EXT4_SIZE    0x04000000
+#define PA_EXT_USER             PA_EXT4         /* User Expansion Space */
+
+#define PA_PERIPHERAL   PA_AREA5_IO
+
+/* SRAM/Reserved */
+#define PA_RESERVED     (PA_PERIPHERAL + 0)
+/* FPGA base address */
+#define PA_FPGA         (PA_PERIPHERAL + 0x01000000)
+/* SMC LAN91C111 */
+#define PA_LAN          (PA_PERIPHERAL + 0x01800000)
+
+
+#define FPGA_SRSTR      (PA_FPGA + 0x000)       /* System reset */
+#define FPGA_IRQ0SR     (PA_FPGA + 0x010)       /* IRQ0 status */
+#define FPGA_IRQ0MR     (PA_FPGA + 0x020)       /* IRQ0 mask */
+#define FPGA_BDMR       (PA_FPGA + 0x030)       /* Board operating mode */
+#define FPGA_INTT0PRTR  (PA_FPGA + 0x040)       /* Interrupt test mode0 port */
+#define FPGA_INTT0SELR  (PA_FPGA + 0x050)       /* Int. test mode0 select */
+#define FPGA_INTT1POLR  (PA_FPGA + 0x060)       /* Int. test mode0 polarity */
+#define FPGA_NMIR       (PA_FPGA + 0x070)       /* NMI source */
+#define FPGA_NMIMR      (PA_FPGA + 0x080)       /* NMI mask */
+#define FPGA_IRQR       (PA_FPGA + 0x090)       /* IRQX source */
+#define FPGA_IRQMR      (PA_FPGA + 0x0A0)       /* IRQX mask */
+#define FPGA_SLEDR      (PA_FPGA + 0x0B0)       /* LED control */
+#define PA_LED                  FPGA_SLEDR
+#define FPGA_MAPSWR     (PA_FPGA + 0x0C0)       /* Map switch */
+#define FPGA_FPVERR     (PA_FPGA + 0x0D0)       /* FPGA version */
+#define FPGA_FPDATER    (PA_FPGA + 0x0E0)       /* FPGA date */
+#define FPGA_RSE        (PA_FPGA + 0x100)       /* Reset source */
+#define FPGA_EASR       (PA_FPGA + 0x110)       /* External area select */
+#define FPGA_SPER       (PA_FPGA + 0x120)       /* Serial port enable */
+#define FPGA_IMSR       (PA_FPGA + 0x130)       /* Interrupt mode select */
+#define FPGA_PCIMR      (PA_FPGA + 0x140)       /* PCI Mode */
+#define FPGA_DIPSWMR    (PA_FPGA + 0x150)       /* DIPSW monitor */
+#define FPGA_FPODR      (PA_FPGA + 0x160)       /* Output port data */
+#define FPGA_ATAESR     (PA_FPGA + 0x170)       /* ATA extended bus status */
+#define FPGA_IRQPOLR    (PA_FPGA + 0x180)       /* IRQx polarity */
+
+
+#define SDK7780_NR_IRL                  15
+/* IDE/ATA interrupt */
+#define IRQ_CFCARD                              14
+/* SMC interrupt */
+#define IRQ_ETHERNET                    6
+
+
+/* arch/sh/boards/renesas/sdk7780/irq.c */
+void init_sdk7780_IRQ(void);
+
+#define __IO_PREFIX             sdk7780
+#include <asm/io_generic.h>
+
+#endif  /* __ASM_SH_RENESAS_SDK7780_H */
diff --git a/include/asm-sh/sections.h b/include/asm-sh/sections.h
index bd9cbc967c2a..8f8f4ad400df 100644
--- a/include/asm-sh/sections.h
+++ b/include/asm-sh/sections.h
@@ -4,6 +4,7 @@
 #include <asm-generic/sections.h>
 
 extern long __machvec_start, __machvec_end;
+extern char __uncached_start, __uncached_end;
 extern char _ebss[];
 
 #endif /* __ASM_SH_SECTIONS_H */
diff --git a/include/asm-sh/sigcontext.h b/include/asm-sh/sigcontext.h
index eb8effba2e80..8ce1435bc0bf 100644
--- a/include/asm-sh/sigcontext.h
+++ b/include/asm-sh/sigcontext.h
@@ -4,6 +4,18 @@
 struct sigcontext {
         unsigned long   oldmask;
 
+#if defined(__SH5__) || defined(CONFIG_CPU_SH5)
+        /* CPU registers */
+        unsigned long long sc_regs[63];
+        unsigned long long sc_tregs[8];
+        unsigned long long sc_pc;
+        unsigned long long sc_sr;
+
+        /* FPU registers */
+        unsigned long long sc_fpregs[32];
+        unsigned int sc_fpscr;
+        unsigned int sc_fpvalid;
+#else
         /* CPU registers */
         unsigned long sc_regs[16];
         unsigned long sc_pc;
@@ -13,7 +25,8 @@ struct sigcontext {
         unsigned long sc_mach;
         unsigned long sc_macl;
 
-#if defined(__SH4__) || defined(CONFIG_CPU_SH4)
+#if defined(__SH4__) || defined(CONFIG_CPU_SH4) || \
+    defined(__SH2A__) || defined(CONFIG_CPU_SH2A)
         /* FPU registers */
         unsigned long sc_fpregs[16];
         unsigned long sc_xfpregs[16];
@@ -21,6 +34,7 @@ struct sigcontext {
         unsigned int sc_fpul;
         unsigned int sc_ownedfp;
 #endif
+#endif
 };
 
 #endif /* __ASM_SH_SIGCONTEXT_H */
diff --git a/include/asm-sh/spi.h b/include/asm-sh/spi.h
new file mode 100644
index 000000000000..e96f5b0953c8
--- /dev/null
+++ b/include/asm-sh/spi.h
@@ -0,0 +1,13 @@
+#ifndef __ASM_SPI_H__
+#define __ASM_SPI_H__
+
+struct sh_spi_info;
+
+struct sh_spi_info {
+        int                      bus_num;
+        int                      num_chipselect;
+
+        void (*chip_select)(struct sh_spi_info *spi, int cs, int state);
+};
+
+#endif /* __ASM_SPI_H__ */
diff --git a/include/asm-sh/stat.h b/include/asm-sh/stat.h
index 6d6ad26e3a2a..e1810cc6e3da 100644
--- a/include/asm-sh/stat.h
+++ b/include/asm-sh/stat.h
@@ -15,6 +15,66 @@ struct __old_kernel_stat {
         unsigned long  st_ctime;
 };
 
+#if defined(__SH5__) || defined(CONFIG_CPU_SH5)
+struct stat {
+        unsigned short st_dev;
+        unsigned short __pad1;
+        unsigned long st_ino;
+        unsigned short st_mode;
+        unsigned short st_nlink;
+        unsigned short st_uid;
+        unsigned short st_gid;
+        unsigned short st_rdev;
+        unsigned short __pad2;
+        unsigned long  st_size;
+        unsigned long  st_blksize;
+        unsigned long  st_blocks;
+        unsigned long  st_atime;
+        unsigned long  st_atime_nsec;
+        unsigned long  st_mtime;
+        unsigned long  st_mtime_nsec;
+        unsigned long  st_ctime;
+        unsigned long  st_ctime_nsec;
+        unsigned long  __unused4;
+        unsigned long  __unused5;
+};
+
+/* This matches struct stat64 in glibc2.1, hence the absolutely
+ * insane amounts of padding around dev_t's.
+ */
+struct stat64 {
+        unsigned short  st_dev;
+        unsigned char   __pad0[10];
+
+        unsigned long   st_ino;
+        unsigned int    st_mode;
+        unsigned int    st_nlink;
+
+        unsigned long   st_uid;
+        unsigned long   st_gid;
+
+        unsigned short  st_rdev;
+        unsigned char   __pad3[10];
+
+        long long       st_size;
+        unsigned long   st_blksize;
+
+        unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
+        unsigned long   __pad4;         /* future possible st_blocks high bits */
+
+        unsigned long   st_atime;
+        unsigned long   st_atime_nsec;
+
+        unsigned long   st_mtime;
+        unsigned long   st_mtime_nsec;
+
+        unsigned long   st_ctime;
+        unsigned long   st_ctime_nsec;  /* will be high 32 bits of ctime someday */
+
+        unsigned long   __unused1;
+        unsigned long   __unused2;
+};
+#else
 struct stat {
         unsigned long  st_dev;
         unsigned long  st_ino;
@@ -67,11 +127,12 @@ struct stat64 {
         unsigned long   st_mtime_nsec;
 
         unsigned long   st_ctime;
-        unsigned long   st_ctime_nsec; 
+        unsigned long   st_ctime_nsec;
 
         unsigned long long      st_ino;
 };
 
 #define STAT_HAVE_NSEC 1
+#endif
 
 #endif /* __ASM_SH_STAT_H */
diff --git a/include/asm-sh/string.h b/include/asm-sh/string.h
index 55f8db6bc1d7..8c1ea21dc0ae 100644
--- a/include/asm-sh/string.h
+++ b/include/asm-sh/string.h
@@ -1,131 +1,5 @@
-#ifndef __ASM_SH_STRING_H
-#define __ASM_SH_STRING_H
-
-#ifdef __KERNEL__
-
-/*
- * Copyright (C) 1999 Niibe Yutaka
- * But consider these trivial functions to be public domain.
- */
-
-#define __HAVE_ARCH_STRCPY
-static inline char *strcpy(char *__dest, const char *__src)
-{
-        register char *__xdest = __dest;
-        unsigned long __dummy;
-
-        __asm__ __volatile__("1:\n\t"
-                             "mov.b     @%1+, %2\n\t"
-                             "mov.b     %2, @%0\n\t"
-                             "cmp/eq    #0, %2\n\t"
-                             "bf/s      1b\n\t"
-                             " add      #1, %0\n\t"
-                             : "=r" (__dest), "=r" (__src), "=&z" (__dummy)
-                             : "0" (__dest), "1" (__src)
-                             : "memory", "t");
-
-        return __xdest;
-}
-
-#define __HAVE_ARCH_STRNCPY
-static inline char *strncpy(char *__dest, const char *__src, size_t __n)
-{
-        register char *__xdest = __dest;
-        unsigned long __dummy;
-
-        if (__n == 0)
-                return __xdest;
-
-        __asm__ __volatile__(
-                "1:\n"
-                "mov.b  @%1+, %2\n\t"
-                "mov.b  %2, @%0\n\t"
-                "cmp/eq #0, %2\n\t"
-                "bt/s   2f\n\t"
-                " cmp/eq        %5,%1\n\t"
-                "bf/s   1b\n\t"
-                " add   #1, %0\n"
-                "2:"
-                : "=r" (__dest), "=r" (__src), "=&z" (__dummy)
-                : "0" (__dest), "1" (__src), "r" (__src+__n)
-                : "memory", "t");
-
-        return __xdest;
-}
-
-#define __HAVE_ARCH_STRCMP
-static inline int strcmp(const char *__cs, const char *__ct)
-{
-        register int __res;
-        unsigned long __dummy;
-
-        __asm__ __volatile__(
-                "mov.b  @%1+, %3\n"
-                "1:\n\t"
-                "mov.b  @%0+, %2\n\t"
-                "cmp/eq #0, %3\n\t"
-                "bt     2f\n\t"
-                "cmp/eq %2, %3\n\t"
-                "bt/s   1b\n\t"
-                " mov.b @%1+, %3\n\t"
-                "add    #-2, %1\n\t"
-                "mov.b  @%1, %3\n\t"
-                "sub    %3, %2\n"
-                "2:"
-                : "=r" (__cs), "=r" (__ct), "=&r" (__res), "=&z" (__dummy)
-                : "0" (__cs), "1" (__ct)
-                : "t");
-
-        return __res;
-}
-
-#define __HAVE_ARCH_STRNCMP
-static inline int strncmp(const char *__cs, const char *__ct, size_t __n)
-{
-        register int __res;
-        unsigned long __dummy;
-
-        if (__n == 0)
-                return 0;
-
-        __asm__ __volatile__(
-                "mov.b  @%1+, %3\n"
-                "1:\n\t"
-                "mov.b  @%0+, %2\n\t"
-                "cmp/eq %6, %0\n\t"
-                "bt/s   2f\n\t"
-                " cmp/eq #0, %3\n\t"
-                "bt/s   3f\n\t"
-                " cmp/eq %3, %2\n\t"
-                "bt/s   1b\n\t"
-                " mov.b @%1+, %3\n\t"
-                "add    #-2, %1\n\t"
-                "mov.b  @%1, %3\n"
-                "2:\n\t"
-                "sub    %3, %2\n"
-                "3:"
-                :"=r" (__cs), "=r" (__ct), "=&r" (__res), "=&z" (__dummy)
-                : "0" (__cs), "1" (__ct), "r" (__cs+__n)
-                : "t");
-
-        return __res;
-}
-
-#define __HAVE_ARCH_MEMSET
-extern void *memset(void *__s, int __c, size_t __count);
-
-#define __HAVE_ARCH_MEMCPY
-extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
-
-#define __HAVE_ARCH_MEMMOVE
-extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-
-#define __HAVE_ARCH_MEMCHR
-extern void *memchr(const void *__s, int __c, size_t __n);
-
-#define __HAVE_ARCH_STRLEN
-extern size_t strlen(const char *);
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH_STRING_H */
+#ifdef CONFIG_SUPERH32
+# include "string_32.h"
+#else
+# include "string_64.h"
+#endif
diff --git a/include/asm-sh/string_32.h b/include/asm-sh/string_32.h
new file mode 100644
index 000000000000..55f8db6bc1d7
--- /dev/null
+++ b/include/asm-sh/string_32.h
@@ -0,0 +1,131 @@
+#ifndef __ASM_SH_STRING_H
+#define __ASM_SH_STRING_H
+
+#ifdef __KERNEL__
+
+/*
+ * Copyright (C) 1999 Niibe Yutaka
+ * But consider these trivial functions to be public domain.
+ */
+
+#define __HAVE_ARCH_STRCPY
+static inline char *strcpy(char *__dest, const char *__src)
+{
+        register char *__xdest = __dest;
+        unsigned long __dummy;
+
+        __asm__ __volatile__("1:\n\t"
+                             "mov.b     @%1+, %2\n\t"
+                             "mov.b     %2, @%0\n\t"
+                             "cmp/eq    #0, %2\n\t"
+                             "bf/s      1b\n\t"
+                             " add      #1, %0\n\t"
+                             : "=r" (__dest), "=r" (__src), "=&z" (__dummy)
+                             : "0" (__dest), "1" (__src)
+                             : "memory", "t");
+
+        return __xdest;
+}
+
+#define __HAVE_ARCH_STRNCPY
+static inline char *strncpy(char *__dest, const char *__src, size_t __n)
+{
+        register char *__xdest = __dest;
+        unsigned long __dummy;
+
+        if (__n == 0)
+                return __xdest;
+
+        __asm__ __volatile__(
+                "1:\n"
+                "mov.b  @%1+, %2\n\t"
+                "mov.b  %2, @%0\n\t"
+                "cmp/eq #0, %2\n\t"
+                "bt/s   2f\n\t"
+                " cmp/eq        %5,%1\n\t"
+                "bf/s   1b\n\t"
+                " add   #1, %0\n"
+                "2:"
+                : "=r" (__dest), "=r" (__src), "=&z" (__dummy)
+                : "0" (__dest), "1" (__src), "r" (__src+__n)
+                : "memory", "t");
+
+        return __xdest;
+}
+
+#define __HAVE_ARCH_STRCMP
+static inline int strcmp(const char *__cs, const char *__ct)
+{
+        register int __res;
+        unsigned long __dummy;
+
+        __asm__ __volatile__(
+                "mov.b  @%1+, %3\n"
+                "1:\n\t"
+                "mov.b  @%0+, %2\n\t"
+                "cmp/eq #0, %3\n\t"
+                "bt     2f\n\t"
+                "cmp/eq %2, %3\n\t"
+                "bt/s   1b\n\t"
+                " mov.b @%1+, %3\n\t"
+                "add    #-2, %1\n\t"
+                "mov.b  @%1, %3\n\t"
+                "sub    %3, %2\n"
+                "2:"
+                : "=r" (__cs), "=r" (__ct), "=&r" (__res), "=&z" (__dummy)
+                : "0" (__cs), "1" (__ct)
+                : "t");
+
+        return __res;
+}
+
+#define __HAVE_ARCH_STRNCMP
+static inline int strncmp(const char *__cs, const char *__ct, size_t __n)
+{
+        register int __res;
+        unsigned long __dummy;
+
+        if (__n == 0)
+                return 0;
+
+        __asm__ __volatile__(
+                "mov.b  @%1+, %3\n"
+                "1:\n\t"
+                "mov.b  @%0+, %2\n\t"
+                "cmp/eq %6, %0\n\t"
+                "bt/s   2f\n\t"
+                " cmp/eq #0, %3\n\t"
+                "bt/s   3f\n\t"
+                " cmp/eq %3, %2\n\t"
+                "bt/s   1b\n\t"
+                " mov.b @%1+, %3\n\t"
+                "add    #-2, %1\n\t"
+                "mov.b  @%1, %3\n"
+                "2:\n\t"
+                "sub    %3, %2\n"
+                "3:"
+                :"=r" (__cs), "=r" (__ct), "=&r" (__res), "=&z" (__dummy)
+                : "0" (__cs), "1" (__ct), "r" (__cs+__n)
+                : "t");
+
+        return __res;
+}
+
+#define __HAVE_ARCH_MEMSET
+extern void *memset(void *__s, int __c, size_t __count);
+
+#define __HAVE_ARCH_MEMCPY
+extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
+
+#define __HAVE_ARCH_MEMMOVE
+extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
+
+#define __HAVE_ARCH_MEMCHR
+extern void *memchr(const void *__s, int __c, size_t __n);
+
+#define __HAVE_ARCH_STRLEN
+extern size_t strlen(const char *);
+
+#endif /* __KERNEL__ */
+
+#endif /* __ASM_SH_STRING_H */
diff --git a/include/asm-sh64/string.h b/include/asm-sh/string_64.h
index 8a7357366ce8..aa1fef229c78 100644
--- a/include/asm-sh64/string.h
+++ b/include/asm-sh/string_64.h
@@ -1,21 +1,17 @@
-#ifndef __ASM_SH64_STRING_H
-#define __ASM_SH64_STRING_H
+#ifndef __ASM_SH_STRING_64_H
+#define __ASM_SH_STRING_64_H
 
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/string.h
+ * include/asm-sh/string_64.h
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  *
- * Empty on purpose. ARCH SH64 ASM libs are out of the current project scope.
- *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
 
 #define __HAVE_ARCH_MEMCPY
-
 extern void *memcpy(void *dest, const void *src, size_t count);
 
-#endif
+#endif /* __ASM_SH_STRING_64_H */
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index 4faa2fb88616..772cd1a0a674 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -12,60 +12,9 @@
 #include <asm/types.h>
 #include <asm/ptrace.h>
 
-struct task_struct *__switch_to(struct task_struct *prev,
-                                struct task_struct *next);
+#define AT_VECTOR_SIZE_ARCH 5 /* entries in ARCH_DLINFO */
 
-#define AT_VECTOR_SIZE_ARCH 1 /* entries in ARCH_DLINFO */
-/*
- *      switch_to() should switch tasks to task nr n, first
- */
-
-#define switch_to(prev, next, last) do {                                \
- struct task_struct *__last;                                            \
- register unsigned long *__ts1 __asm__ ("r1") = &prev->thread.sp;       \
- register unsigned long *__ts2 __asm__ ("r2") = &prev->thread.pc;       \
- register unsigned long *__ts4 __asm__ ("r4") = (unsigned long *)prev;  \
- register unsigned long *__ts5 __asm__ ("r5") = (unsigned long *)next;  \
- register unsigned long *__ts6 __asm__ ("r6") = &next->thread.sp;       \
- register unsigned long __ts7 __asm__ ("r7") = next->thread.pc;         \
- __asm__ __volatile__ (".balign 4\n\t"                                  \
-                       "stc.l   gbr, @-r15\n\t"                         \
-                       "sts.l   pr, @-r15\n\t"                          \
-                       "mov.l   r8, @-r15\n\t"                          \
-                       "mov.l   r9, @-r15\n\t"                          \
-                       "mov.l   r10, @-r15\n\t"                         \
-                       "mov.l   r11, @-r15\n\t"                         \
-                       "mov.l   r12, @-r15\n\t"                         \
-                       "mov.l   r13, @-r15\n\t"                         \
-                       "mov.l   r14, @-r15\n\t"                         \
-                       "mov.l   r15, @r1        ! save SP\n\t"          \
-                       "mov.l   @r6, r15        ! change to new stack\n\t" \
-                       "mova    1f, %0\n\t"                             \
-                       "mov.l   %0, @r2         ! save PC\n\t"          \
-                       "mov.l   2f, %0\n\t"                             \
-                       "jmp     @%0             ! call __switch_to\n\t" \
-                       " lds    r7, pr          !  with return to new PC\n\t" \
-                       ".balign 4\n"                                    \
-                       "2:\n\t"                                         \
-                       ".long   __switch_to\n"                          \
-                       "1:\n\t"                                         \
-                       "mov.l   @r15+, r14\n\t"                         \
-                       "mov.l   @r15+, r13\n\t"                         \
-                       "mov.l   @r15+, r12\n\t"                         \
-                       "mov.l   @r15+, r11\n\t"                         \
-                       "mov.l   @r15+, r10\n\t"                         \
-                       "mov.l   @r15+, r9\n\t"                          \
-                       "mov.l   @r15+, r8\n\t"                          \
-                       "lds.l   @r15+, pr\n\t"                          \
-                       "ldc.l   @r15+, gbr\n\t"                         \
-                       : "=z" (__last)                                  \
-                       : "r" (__ts1), "r" (__ts2), "r" (__ts4),         \
-                         "r" (__ts5), "r" (__ts6), "r" (__ts7)          \
-                       : "r3", "t");                                    \
-        last = __last;                                                  \
-} while (0)
-
-#ifdef CONFIG_CPU_SH4A
+#if defined(CONFIG_CPU_SH4A) || defined(CONFIG_CPU_SH5)
 #define __icbi()                        \
 {                                       \
         unsigned long __addr;           \
@@ -91,7 +40,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
  * Historically we have only done this type of barrier for the MMUCR, but
  * it's also necessary for the CCR, so we make it generic here instead.
  */
-#ifdef CONFIG_CPU_SH4A
+#if defined(CONFIG_CPU_SH4A) || defined(CONFIG_CPU_SH5)
 #define mb()            __asm__ __volatile__ ("synco": : :"memory")
 #define rmb()           mb()
 #define wmb()           __asm__ __volatile__ ("synco": : :"memory")
@@ -119,63 +68,11 @@ struct task_struct *__switch_to(struct task_struct *prev,
 
 #define set_mb(var, value) do { (void)xchg(&var, value); } while (0)
 
-/*
- * Jump to P2 area.
- * When handling TLB or caches, we need to do it from P2 area.
- */
-#define jump_to_P2()                    \
-do {                                    \
-        unsigned long __dummy;          \
-        __asm__ __volatile__(           \
-                "mov.l  1f, %0\n\t"     \
-                "or     %1, %0\n\t"     \
-                "jmp    @%0\n\t"        \
-                " nop\n\t"              \
-                ".balign 4\n"           \
-                "1:     .long 2f\n"     \
-                "2:"                    \
-                : "=&r" (__dummy)       \
-                : "r" (0x20000000));    \
-} while (0)
-
-/*
- * Back to P1 area.
- */
-#define back_to_P1()                                    \
-do {                                                    \
-        unsigned long __dummy;                          \
-        ctrl_barrier();                                 \
-        __asm__ __volatile__(                           \
-                "mov.l  1f, %0\n\t"                     \
-                "jmp    @%0\n\t"                        \
-                " nop\n\t"                              \
-                ".balign 4\n"                           \
-                "1:     .long 2f\n"                     \
-                "2:"                                    \
-                : "=&r" (__dummy));                     \
-} while (0)
-
-static inline unsigned long xchg_u32(volatile u32 *m, unsigned long val)
-{
-        unsigned long flags, retval;
-
-        local_irq_save(flags);
-        retval = *m;
-        *m = val;
-        local_irq_restore(flags);
-        return retval;
-}
-
-static inline unsigned long xchg_u8(volatile u8 *m, unsigned long val)
-{
-        unsigned long flags, retval;
-
-        local_irq_save(flags);
-        retval = *m;
-        *m = val & 0xff;
-        local_irq_restore(flags);
-        return retval;
-}
+#ifdef CONFIG_GUSA_RB
+#include <asm/cmpxchg-grb.h>
+#else
+#include <asm/cmpxchg-irq.h>
+#endif
 
 extern void __xchg_called_with_bad_pointer(void);
 
@@ -202,20 +99,6 @@ extern void __xchg_called_with_bad_pointer(void);
 #define xchg(ptr,x)     \
         ((__typeof__(*(ptr)))__xchg((ptr),(unsigned long)(x), sizeof(*(ptr))))
 
-static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old,
-        unsigned long new)
-{
-        __u32 retval;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        retval = *m;
-        if (retval == old)
-                *m = new;
-        local_irq_restore(flags);       /* implies memory barrier  */
-        return retval;
-}
-
 /* This function doesn't exist, so you'll get a linker error
  * if something tries to do an invalid cmpxchg(). */
 extern void __cmpxchg_called_with_bad_pointer(void);
@@ -255,10 +138,14 @@ static inline void *set_exception_table_evt(unsigned int evt, void *handler)
  */
 #ifdef CONFIG_CPU_SH2A
 extern unsigned int instruction_size(unsigned int insn);
-#else
+#elif defined(CONFIG_SUPERH32)
 #define instruction_size(insn)  (2)
+#else
+#define instruction_size(insn)  (4)
 #endif
 
+extern unsigned long cached_to_uncached;
+
 /* XXX
  * disable hlt during certain critical i/o operations
  */
@@ -270,13 +157,35 @@ void default_idle(void);
 void per_cpu_trap_init(void);
 
 asmlinkage void break_point_trap(void);
-asmlinkage void debug_trap_handler(unsigned long r4, unsigned long r5,
-                                   unsigned long r6, unsigned long r7,
-                                   struct pt_regs __regs);
-asmlinkage void bug_trap_handler(unsigned long r4, unsigned long r5,
-                                 unsigned long r6, unsigned long r7,
-                                 struct pt_regs __regs);
+
+#ifdef CONFIG_SUPERH32
+#define BUILD_TRAP_HANDLER(name)                                        \
+asmlinkage void name##_trap_handler(unsigned long r4, unsigned long r5, \
+                                    unsigned long r6, unsigned long r7, \
+                                    struct pt_regs __regs)
+
+#define TRAP_HANDLER_DECL                               \
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);  \
+        unsigned int vec = regs->tra;                   \
+        (void)vec;
+#else
+#define BUILD_TRAP_HANDLER(name)        \
+asmlinkage void name##_trap_handler(unsigned int vec, struct pt_regs *regs)
+#define TRAP_HANDLER_DECL
+#endif
+
+BUILD_TRAP_HANDLER(address_error);
+BUILD_TRAP_HANDLER(debug);
+BUILD_TRAP_HANDLER(bug);
+BUILD_TRAP_HANDLER(fpu_error);
+BUILD_TRAP_HANDLER(fpu_state_restore);
 
 #define arch_align_stack(x) (x)
 
+#ifdef CONFIG_SUPERH32
+# include "system_32.h"
+#else
+# include "system_64.h"
+#endif
+
 #endif
diff --git a/include/asm-sh/system_32.h b/include/asm-sh/system_32.h
new file mode 100644
index 000000000000..7ff08d956ba8
--- /dev/null
+++ b/include/asm-sh/system_32.h
@@ -0,0 +1,99 @@
+#ifndef __ASM_SH_SYSTEM_32_H
+#define __ASM_SH_SYSTEM_32_H
+
+#include <linux/types.h>
+
+struct task_struct *__switch_to(struct task_struct *prev,
+                                struct task_struct *next);
+
+/*
+ *      switch_to() should switch tasks to task nr n, first
+ */
+#define switch_to(prev, next, last)                                     \
+do {                                                                    \
+        register u32 *__ts1 __asm__ ("r1") = (u32 *)&prev->thread.sp;   \
+        register u32 *__ts2 __asm__ ("r2") = (u32 *)&prev->thread.pc;   \
+        register u32 *__ts4 __asm__ ("r4") = (u32 *)prev;               \
+        register u32 *__ts5 __asm__ ("r5") = (u32 *)next;               \
+        register u32 *__ts6 __asm__ ("r6") = (u32 *)&next->thread.sp;   \
+        register u32 __ts7 __asm__ ("r7") = next->thread.pc;            \
+        struct task_struct *__last;                                     \
+                                                                        \
+        __asm__ __volatile__ (                                          \
+                ".balign 4\n\t"                                         \
+                "stc.l  gbr, @-r15\n\t"                                 \
+                "sts.l  pr, @-r15\n\t"                                  \
+                "mov.l  r8, @-r15\n\t"                                  \
+                "mov.l  r9, @-r15\n\t"                                  \
+                "mov.l  r10, @-r15\n\t"                                 \
+                "mov.l  r11, @-r15\n\t"                                 \
+                "mov.l  r12, @-r15\n\t"                                 \
+                "mov.l  r13, @-r15\n\t"                                 \
+                "mov.l  r14, @-r15\n\t"                                 \
+                "mov.l  r15, @r1\t! save SP\n\t"                        \
+                "mov.l  @r6, r15\t! change to new stack\n\t"            \
+                "mova   1f, %0\n\t"                                     \
+                "mov.l  %0, @r2\t! save PC\n\t"                         \
+                "mov.l  2f, %0\n\t"                                     \
+                "jmp    @%0\t! call __switch_to\n\t"                    \
+                " lds   r7, pr\t!  with return to new PC\n\t"           \
+                ".balign        4\n"                                    \
+                "2:\n\t"                                                \
+                ".long  __switch_to\n"                                  \
+                "1:\n\t"                                                \
+                "mov.l  @r15+, r14\n\t"                                 \
+                "mov.l  @r15+, r13\n\t"                                 \
+                "mov.l  @r15+, r12\n\t"                                 \
+                "mov.l  @r15+, r11\n\t"                                 \
+                "mov.l  @r15+, r10\n\t"                                 \
+                "mov.l  @r15+, r9\n\t"                                  \
+                "mov.l  @r15+, r8\n\t"                                  \
+                "lds.l  @r15+, pr\n\t"                                  \
+                "ldc.l  @r15+, gbr\n\t"                                 \
+                : "=z" (__last)                                         \
+                : "r" (__ts1), "r" (__ts2), "r" (__ts4),                \
+                  "r" (__ts5), "r" (__ts6), "r" (__ts7)                 \
+                : "r3", "t");                                           \
+                                                                        \
+        last = __last;                                                  \
+} while (0)
+
+#define __uses_jump_to_uncached __attribute__ ((__section__ (".uncached.text")))
+
+/*
+ * Jump to uncached area.
+ * When handling TLB or caches, we need to do it from an uncached area.
+ */
+#define jump_to_uncached()                      \
+do {                                            \
+        unsigned long __dummy;                  \
+                                                \
+        __asm__ __volatile__(                   \
+                "mova   1f, %0\n\t"             \
+                "add    %1, %0\n\t"             \
+                "jmp    @%0\n\t"                \
+                " nop\n\t"                      \
+                ".balign 4\n"                   \
+                "1:"                            \
+                : "=&z" (__dummy)               \
+                : "r" (cached_to_uncached));    \
+} while (0)
+
+/*
+ * Back to cached area.
+ */
+#define back_to_cached()                                \
+do {                                                    \
+        unsigned long __dummy;                          \
+        ctrl_barrier();                                 \
+        __asm__ __volatile__(                           \
+                "mov.l  1f, %0\n\t"                     \
+                "jmp    @%0\n\t"                        \
+                " nop\n\t"                              \
+                ".balign 4\n"                           \
+                "1:     .long 2f\n"                     \
+                "2:"                                    \
+                : "=&r" (__dummy));                     \
+} while (0)
+
+#endif /* __ASM_SH_SYSTEM_32_H */
diff --git a/include/asm-sh/system_64.h b/include/asm-sh/system_64.h
new file mode 100644
index 000000000000..943acf5ea07c
--- /dev/null
+++ b/include/asm-sh/system_64.h
@@ -0,0 +1,40 @@
+#ifndef __ASM_SH_SYSTEM_64_H
+#define __ASM_SH_SYSTEM_64_H
+
+/*
+ * include/asm-sh/system_64.h
+ *
+ * Copyright (C) 2000, 2001  Paolo Alberelli
+ * Copyright (C) 2003  Paul Mundt
+ * Copyright (C) 2004  Richard Curnow
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <asm/processor.h>
+
+/*
+ *      switch_to() should switch tasks to task nr n, first
+ */
+struct task_struct *sh64_switch_to(struct task_struct *prev,
+                                   struct thread_struct *prev_thread,
+                                   struct task_struct *next,
+                                   struct thread_struct *next_thread);
+
+#define switch_to(prev,next,last)                               \
+do {                                                            \
+        if (last_task_used_math != next) {                      \
+                struct pt_regs *regs = next->thread.uregs;      \
+                if (regs) regs->sr |= SR_FD;                    \
+        }                                                       \
+        last = sh64_switch_to(prev, &prev->thread, next,        \
+                              &next->thread);                   \
+} while (0)
+
+#define __uses_jump_to_uncached
+
+#define jump_to_uncached()      do { } while (0)
+#define back_to_cached()        do { } while (0)
+
+#endif /* __ASM_SH_SYSTEM_64_H */
diff --git a/include/asm-sh/thread_info.h b/include/asm-sh/thread_info.h
index 1f7e1deb8d92..c6577d3dc46d 100644
--- a/include/asm-sh/thread_info.h
+++ b/include/asm-sh/thread_info.h
@@ -74,8 +74,10 @@ register unsigned long current_stack_pointer asm("r15") __attribute_used__;
 static inline struct thread_info *current_thread_info(void)
 {
         struct thread_info *ti;
-#ifdef CONFIG_CPU_HAS_SR_RB
-        __asm__("stc    r7_bank, %0" : "=r" (ti));
+#if defined(CONFIG_SUPERH64)
+        __asm__ __volatile__ ("getcon   cr17, %0" : "=r" (ti));
+#elif defined(CONFIG_CPU_HAS_SR_RB)
+        __asm__ __volatile__ ("stc      r7_bank, %0" : "=r" (ti));
 #else
         unsigned long __dummy;
 
@@ -111,6 +113,7 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_NEED_RESCHED        2       /* rescheduling necessary */
 #define TIF_RESTORE_SIGMASK     3       /* restore signal mask in do_signal() */
 #define TIF_SINGLESTEP          4       /* singlestepping active */
+#define TIF_SYSCALL_AUDIT       5
 #define TIF_USEDFPU             16      /* FPU was used by this task this quantum (SMP) */
 #define TIF_POLLING_NRFLAG      17      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              18
@@ -121,6 +124,7 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_SINGLESTEP         (1<<TIF_SINGLESTEP)
+#define _TIF_SYSCALL_AUDIT              (1<<TIF_SYSCALL_AUDIT)
 #define _TIF_USEDFPU            (1<<TIF_USEDFPU)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 #define _TIF_FREEZE             (1<<TIF_FREEZE)
diff --git a/include/asm-sh/tlb.h b/include/asm-sh/tlb.h
index 53d185bcf872..56ad1fb888a2 100644
--- a/include/asm-sh/tlb.h
+++ b/include/asm-sh/tlb.h
@@ -1,6 +1,12 @@
 #ifndef __ASM_SH_TLB_H
 #define __ASM_SH_TLB_H
 
+#ifdef CONFIG_SUPERH64
+# include "tlb_64.h"
+#endif
+
+#ifndef __ASSEMBLY__
+
 #define tlb_start_vma(tlb, vma) \
         flush_cache_range(vma, vma->vm_start, vma->vm_end)
 
@@ -15,4 +21,6 @@
 #define tlb_flush(tlb)                          flush_tlb_mm((tlb)->mm)
 
 #include <asm-generic/tlb.h>
-#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ASM_SH_TLB_H */
diff --git a/include/asm-sh64/tlb.h b/include/asm-sh/tlb_64.h
index 4979408bd88c..0308e05fc57b 100644
--- a/include/asm-sh64/tlb.h
+++ b/include/asm-sh/tlb_64.h
@@ -1,20 +1,14 @@
 /*
- * include/asm-sh64/tlb.h
+ * include/asm-sh/tlb_64.h
  *
  * Copyright (C) 2003  Paul Mundt
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
- *
- */
-#ifndef __ASM_SH64_TLB_H
-#define __ASM_SH64_TLB_H
-
-/*
- * Note! These are mostly unused, we just need the xTLB_LAST_VAR_UNRESTRICTED
- * for head.S! Once this limitation is gone, we can clean the rest of this up.
  */
+#ifndef __ASM_SH_TLB_64_H
+#define __ASM_SH_TLB_64_H
 
 /* ITLB defines */
 #define ITLB_FIXED      0x00000000      /* First fixed ITLB, see head.S */
@@ -63,30 +57,13 @@ static inline void __flush_tlb_slot(unsigned long long slot)
 }
 
 /* arch/sh64/mm/tlb.c */
-extern int sh64_tlb_init(void);
-extern unsigned long long sh64_next_free_dtlb_entry(void);
-extern unsigned long long sh64_get_wired_dtlb_entry(void);
-extern int sh64_put_wired_dtlb_entry(unsigned long long entry);
-
-extern void sh64_setup_tlb_slot(unsigned long long config_addr, unsigned long eaddr, unsigned long asid, unsigned long paddr);
-extern void sh64_teardown_tlb_slot(unsigned long long config_addr);
-
-#define tlb_start_vma(tlb, vma) \
-        flush_cache_range(vma, vma->vm_start, vma->vm_end)
-
-#define tlb_end_vma(tlb, vma)   \
-        flush_tlb_range(vma, vma->vm_start, vma->vm_end)
-
-#define __tlb_remove_tlb_entry(tlb, pte, address)       do { } while (0)
-
-/*
- * Flush whole TLBs for MM
- */
-#define tlb_flush(tlb)          flush_tlb_mm((tlb)->mm)
-
-#include <asm-generic/tlb.h>
+int sh64_tlb_init(void);
+unsigned long long sh64_next_free_dtlb_entry(void);
+unsigned long long sh64_get_wired_dtlb_entry(void);
+int sh64_put_wired_dtlb_entry(unsigned long long entry);
+void sh64_setup_tlb_slot(unsigned long long config_addr, unsigned long eaddr,
+                         unsigned long asid, unsigned long paddr);
+void sh64_teardown_tlb_slot(unsigned long long config_addr);
 
 #endif /* __ASSEMBLY__ */
-
-#endif /* __ASM_SH64_TLB_H */
-
+#endif /* __ASM_SH_TLB_64_H */
diff --git a/include/asm-sh/types.h b/include/asm-sh/types.h
index 7ba69d9707ef..a6e1d4126e67 100644
--- a/include/asm-sh/types.h
+++ b/include/asm-sh/types.h
@@ -52,6 +52,12 @@ typedef unsigned long long u64;
 
 typedef u32 dma_addr_t;
 
+#ifdef CONFIG_SUPERH32
+typedef u16 opcode_t;
+#else
+typedef u32 opcode_t;
+#endif
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff --git a/include/asm-sh/uaccess.h b/include/asm-sh/uaccess.h
index 77c391fa93d6..ff24ce95b238 100644
--- a/include/asm-sh/uaccess.h
+++ b/include/asm-sh/uaccess.h
@@ -1,563 +1,5 @@
-/* $Id: uaccess.h,v 1.11 2003/10/13 07:21:20 lethal Exp $
- *
- * User space memory access functions
- *
- * Copyright (C) 1999, 2002  Niibe Yutaka
- * Copyright (C) 2003  Paul Mundt
- *
- *  Based on:
- *     MIPS implementation version 1.15 by
- *              Copyright (C) 1996, 1997, 1998 by Ralf Baechle
- *     and i386 version.
- */
-#ifndef __ASM_SH_UACCESS_H
-#define __ASM_SH_UACCESS_H
-
-#include <linux/errno.h>
-#include <linux/sched.h>
-
-#define VERIFY_READ    0
-#define VERIFY_WRITE   1
-
-/*
- * The fs value determines whether argument validity checking should be
- * performed or not.  If get_fs() == USER_DS, checking is performed, with
- * get_fs() == KERNEL_DS, checking is bypassed.
- *
- * For historical reasons (Data Segment Register?), these macros are misnamed.
- */
-
-#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
-
-#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFFUL)
-#define USER_DS         MAKE_MM_SEG(PAGE_OFFSET)
-
-#define segment_eq(a,b) ((a).seg == (b).seg)
-
-#define get_ds()        (KERNEL_DS)
-
-#if !defined(CONFIG_MMU)
-/* NOMMU is always true */
-#define __addr_ok(addr) (1)
-
-static inline mm_segment_t get_fs(void)
-{
-        return USER_DS;
-}
-
-static inline void set_fs(mm_segment_t s)
-{
-}
-
-/*
- * __access_ok: Check if address with size is OK or not.
- *
- * If we don't have an MMU (or if its disabled) the only thing we really have
- * to look out for is if the address resides somewhere outside of what
- * available RAM we have.
- *
- * TODO: This check could probably also stand to be restricted somewhat more..
- * though it still does the Right Thing(tm) for the time being.
- */
-static inline int __access_ok(unsigned long addr, unsigned long size)
-{
-        return ((addr >= memory_start) && ((addr + size) < memory_end));
-}
-#else /* CONFIG_MMU */
-#define __addr_ok(addr) \
-        ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))
-
-#define get_fs()        (current_thread_info()->addr_limit)
-#define set_fs(x)       (current_thread_info()->addr_limit = (x))
-
-/*
- * __access_ok: Check if address with size is OK or not.
- *
- * Uhhuh, this needs 33-bit arithmetic. We have a carry..
- *
- * sum := addr + size;  carry? --> flag = true;
- * if (sum >= addr_limit) flag = true;
- */
-static inline int __access_ok(unsigned long addr, unsigned long size)
-{
-        unsigned long flag, sum;
-
-        __asm__("clrt\n\t"
-                "addc   %3, %1\n\t"
-                "movt   %0\n\t"
-                "cmp/hi %4, %1\n\t"
-                "rotcl  %0"
-                :"=&r" (flag), "=r" (sum)
-                :"1" (addr), "r" (size),
-                 "r" (current_thread_info()->addr_limit.seg)
-                :"t");
-        return flag == 0;
-
-}
-#endif /* CONFIG_MMU */
-
-static inline int access_ok(int type, const void __user *p, unsigned long size)
-{
-        unsigned long addr = (unsigned long)p;
-        return __access_ok(addr, size);
-}
-
-/*
- * Uh, these should become the main single-value transfer routines ...
- * They automatically use the right size if we just have the right
- * pointer type ...
- *
- * As SuperH uses the same address space for kernel and user data, we
- * can just do these as direct assignments.
- *
- * Careful to not
- * (a) re-use the arguments for side effects (sizeof is ok)
- * (b) require any knowledge of processes at this stage
- */
-#define put_user(x,ptr) __put_user_check((x),(ptr),sizeof(*(ptr)))
-#define get_user(x,ptr) __get_user_check((x),(ptr),sizeof(*(ptr)))
-
-/*
- * The "__xxx" versions do not do address space checking, useful when
- * doing multiple accesses to the same area (the user has to do the
- * checks by hand with "access_ok()")
- */
-#define __put_user(x,ptr) \
-  __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
-#define __get_user(x,ptr) \
-  __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
-
-struct __large_struct { unsigned long buf[100]; };
-#define __m(x) (*(struct __large_struct __user *)(x))
-
-#define __get_user_size(x,ptr,size,retval)                      \
-do {                                                            \
-        retval = 0;                                             \
-        __chk_user_ptr(ptr);                                    \
-        switch (size) {                                         \
-        case 1:                                                 \
-                __get_user_asm(x, ptr, retval, "b");            \
-                break;                                          \
-        case 2:                                                 \
-                __get_user_asm(x, ptr, retval, "w");            \
-                break;                                          \
-        case 4:                                                 \
-                __get_user_asm(x, ptr, retval, "l");            \
-                break;                                          \
-        default:                                                \
-                __get_user_unknown();                           \
-                break;                                          \
-        }                                                       \
-} while (0)
-
-#define __get_user_nocheck(x,ptr,size)                          \
-({                                                              \
-        long __gu_err, __gu_val;                                \
-        __get_user_size(__gu_val, (ptr), (size), __gu_err);     \
-        (x) = (__typeof__(*(ptr)))__gu_val;                     \
-        __gu_err;                                               \
-})
-
-#ifdef CONFIG_MMU
-#define __get_user_check(x,ptr,size)                            \
-({                                                              \
-        long __gu_err, __gu_val;                                \
-        __chk_user_ptr(ptr);                                    \
-        switch (size) {                                         \
-        case 1:                                                 \
-                __get_user_1(__gu_val, (ptr), __gu_err);        \
-                break;                                          \
-        case 2:                                                 \
-                __get_user_2(__gu_val, (ptr), __gu_err);        \
-                break;                                          \
-        case 4:                                                 \
-                __get_user_4(__gu_val, (ptr), __gu_err);        \
-                break;                                          \
-        default:                                                \
-                __get_user_unknown();                           \
-                break;                                          \
-        }                                                       \
-                                                                \
-        (x) = (__typeof__(*(ptr)))__gu_val;                     \
-        __gu_err;                                               \
-})
-
-#define __get_user_1(x,addr,err) ({             \
-__asm__("stc    r7_bank, %1\n\t"                \
-        "mov.l  @(8,%1), %1\n\t"                \
-        "and    %2, %1\n\t"                     \
-        "cmp/pz %1\n\t"                         \
-        "bt/s   1f\n\t"                         \
-        " mov   #0, %0\n\t"                     \
-        "0:\n"                                  \
-        "mov    #-14, %0\n\t"                   \
-        "bra    2f\n\t"                         \
-        " mov   #0, %1\n"                       \
-        "1:\n\t"                                \
-        "mov.b  @%2, %1\n\t"                    \
-        "extu.b %1, %1\n"                       \
-        "2:\n"                                  \
-        ".section       __ex_table,\"a\"\n\t"   \
-        ".long  1b, 0b\n\t"                     \
-        ".previous"                             \
-        : "=&r" (err), "=&r" (x)                \
-        : "r" (addr)                            \
-        : "t");                                 \
-})
-
-#define __get_user_2(x,addr,err) ({             \
-__asm__("stc    r7_bank, %1\n\t"                \
-        "mov.l  @(8,%1), %1\n\t"                \
-        "and    %2, %1\n\t"                     \
-        "cmp/pz %1\n\t"                         \
-        "bt/s   1f\n\t"                         \
-        " mov   #0, %0\n\t"                     \
-        "0:\n"                                  \
-        "mov    #-14, %0\n\t"                   \
-        "bra    2f\n\t"                         \
-        " mov   #0, %1\n"                       \
-        "1:\n\t"                                \
-        "mov.w  @%2, %1\n\t"                    \
-        "extu.w %1, %1\n"                       \
-        "2:\n"                                  \
-        ".section       __ex_table,\"a\"\n\t"   \
-        ".long  1b, 0b\n\t"                     \
-        ".previous"                             \
-        : "=&r" (err), "=&r" (x)                \
-        : "r" (addr)                            \
-        : "t");                                 \
-})
-
-#define __get_user_4(x,addr,err) ({             \
-__asm__("stc    r7_bank, %1\n\t"                \
-        "mov.l  @(8,%1), %1\n\t"                \
-        "and    %2, %1\n\t"                     \
-        "cmp/pz %1\n\t"                         \
-        "bt/s   1f\n\t"                         \
-        " mov   #0, %0\n\t"                     \
-        "0:\n"                                  \
-        "mov    #-14, %0\n\t"                   \
-        "bra    2f\n\t"                         \
-        " mov   #0, %1\n"                       \
-        "1:\n\t"                                \
-        "mov.l  @%2, %1\n\t"                    \
-        "2:\n"                                  \
-        ".section       __ex_table,\"a\"\n\t"   \
-        ".long  1b, 0b\n\t"                     \
-        ".previous"                             \
-        : "=&r" (err), "=&r" (x)                \
-        : "r" (addr)                            \
-        : "t");                                 \
-})
-#else /* CONFIG_MMU */
-#define __get_user_check(x,ptr,size)                                    \
-({                                                                      \
-        long __gu_err, __gu_val;                                        \
-        if (__access_ok((unsigned long)(ptr), (size))) {                \
-                __get_user_size(__gu_val, (ptr), (size), __gu_err);     \
-                (x) = (__typeof__(*(ptr)))__gu_val;                     \
-        } else                                                          \
-                __gu_err = -EFAULT;                                     \
-        __gu_err;                                                       \
-})
-#endif
-
-#define __get_user_asm(x, addr, err, insn) \
-({ \
-__asm__ __volatile__( \
-        "1:\n\t" \
-        "mov." insn "   %2, %1\n\t" \
-        "mov    #0, %0\n" \
-        "2:\n" \
-        ".section       .fixup,\"ax\"\n" \
-        "3:\n\t" \
-        "mov    #0, %1\n\t" \
-        "mov.l  4f, %0\n\t" \
-        "jmp    @%0\n\t" \
-        " mov   %3, %0\n" \
-        "4:     .long   2b\n\t" \
-        ".previous\n" \
-        ".section       __ex_table,\"a\"\n\t" \
-        ".long  1b, 3b\n\t" \
-        ".previous" \
-        :"=&r" (err), "=&r" (x) \
-        :"m" (__m(addr)), "i" (-EFAULT)); })
-
-extern void __get_user_unknown(void);
-
-#define __put_user_size(x,ptr,size,retval)              \
-do {                                                    \
-        retval = 0;                                     \
-        __chk_user_ptr(ptr);                            \
-        switch (size) {                                 \
-        case 1:                                         \
-                __put_user_asm(x, ptr, retval, "b");    \
-                break;                                  \
-        case 2:                                         \
-                __put_user_asm(x, ptr, retval, "w");    \
-                break;                                  \
-        case 4:                                         \
-                __put_user_asm(x, ptr, retval, "l");    \
-                break;                                  \
-        case 8:                                         \
-                __put_user_u64(x, ptr, retval);         \
-                break;                                  \
-        default:                                        \
-                __put_user_unknown();                   \
-        }                                               \
-} while (0)
-
-#define __put_user_nocheck(x,ptr,size)                  \
-({                                                      \
-        long __pu_err;                                  \
-        __put_user_size((x),(ptr),(size),__pu_err);     \
-        __pu_err;                                       \
-})
-
-#define __put_user_check(x,ptr,size)                            \
-({                                                              \
-        long __pu_err = -EFAULT;                                \
-        __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
-                                                                \
-        if (__access_ok((unsigned long)__pu_addr,size))         \
-                __put_user_size((x),__pu_addr,(size),__pu_err); \
-        __pu_err;                                               \
-})
-
-#define __put_user_asm(x, addr, err, insn) \
-({ \
-__asm__ __volatile__( \
-        "1:\n\t" \
-        "mov." insn "   %1, %2\n\t" \
-        "mov    #0, %0\n" \
-        "2:\n" \
-        ".section       .fixup,\"ax\"\n" \
-        "3:\n\t" \
-        "nop\n\t" \
-        "mov.l  4f, %0\n\t" \
-        "jmp    @%0\n\t" \
-        "mov    %3, %0\n" \
-        "4:     .long   2b\n\t" \
-        ".previous\n" \
-        ".section       __ex_table,\"a\"\n\t" \
-        ".long  1b, 3b\n\t" \
-        ".previous" \
-        :"=&r" (err) \
-        :"r" (x), "m" (__m(addr)), "i" (-EFAULT) \
-        :"memory"); })
-
-#if defined(__LITTLE_ENDIAN__)
-#define __put_user_u64(val,addr,retval) \
-({ \
-__asm__ __volatile__( \
-        "1:\n\t" \
-        "mov.l  %R1,%2\n\t" \
-        "mov.l  %S1,%T2\n\t" \
-        "mov    #0,%0\n" \
-        "2:\n" \
-        ".section       .fixup,\"ax\"\n" \
-        "3:\n\t" \
-        "nop\n\t" \
-        "mov.l  4f,%0\n\t" \
-        "jmp    @%0\n\t" \
-        " mov   %3,%0\n" \
-        "4:     .long   2b\n\t" \
-        ".previous\n" \
-        ".section       __ex_table,\"a\"\n\t" \
-        ".long  1b, 3b\n\t" \
-        ".previous" \
-        : "=r" (retval) \
-        : "r" (val), "m" (__m(addr)), "i" (-EFAULT) \
-        : "memory"); })
+#ifdef CONFIG_SUPERH32
+# include "uaccess_32.h"
 #else
-#define __put_user_u64(val,addr,retval) \
-({ \
-__asm__ __volatile__( \
-        "1:\n\t" \
-        "mov.l  %S1,%2\n\t" \
-        "mov.l  %R1,%T2\n\t" \
-        "mov    #0,%0\n" \
-        "2:\n" \
-        ".section       .fixup,\"ax\"\n" \
-        "3:\n\t" \
-        "nop\n\t" \
-        "mov.l  4f,%0\n\t" \
-        "jmp    @%0\n\t" \
-        " mov   %3,%0\n" \
-        "4:     .long   2b\n\t" \
-        ".previous\n" \
-        ".section       __ex_table,\"a\"\n\t" \
-        ".long  1b, 3b\n\t" \
-        ".previous" \
-        : "=r" (retval) \
-        : "r" (val), "m" (__m(addr)), "i" (-EFAULT) \
-        : "memory"); })
+# include "uaccess_64.h"
 #endif
-
-extern void __put_user_unknown(void);
-
-/* Generic arbitrary sized copy.  */
-/* Return the number of bytes NOT copied */
-__kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n);
-
-#define copy_to_user(to,from,n) ({ \
-void *__copy_to = (void *) (to); \
-__kernel_size_t __copy_size = (__kernel_size_t) (n); \
-__kernel_size_t __copy_res; \
-if(__copy_size && __access_ok((unsigned long)__copy_to, __copy_size)) { \
-__copy_res = __copy_user(__copy_to, (void *) (from), __copy_size); \
-} else __copy_res = __copy_size; \
-__copy_res; })
-
-#define copy_from_user(to,from,n) ({ \
-void *__copy_to = (void *) (to); \
-void *__copy_from = (void *) (from); \
-__kernel_size_t __copy_size = (__kernel_size_t) (n); \
-__kernel_size_t __copy_res; \
-if(__copy_size && __access_ok((unsigned long)__copy_from, __copy_size)) { \
-__copy_res = __copy_user(__copy_to, __copy_from, __copy_size); \
-} else __copy_res = __copy_size; \
-__copy_res; })
-
-static __always_inline unsigned long
-__copy_from_user(void *to, const void __user *from, unsigned long n)
-{
-        return __copy_user(to, (__force void *)from, n);
-}
-
-static __always_inline unsigned long __must_check
-__copy_to_user(void __user *to, const void *from, unsigned long n)
-{
-        return __copy_user((__force void *)to, from, n);
-}
-
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
-
-/*
- * Clear the area and return remaining number of bytes
- * (on failure.  Usually it's 0.)
- */
-extern __kernel_size_t __clear_user(void *addr, __kernel_size_t size);
-
-#define clear_user(addr,n) ({ \
-void * __cl_addr = (addr); \
-unsigned long __cl_size = (n); \
-if (__cl_size && __access_ok(((unsigned long)(__cl_addr)), __cl_size)) \
-__cl_size = __clear_user(__cl_addr, __cl_size); \
-__cl_size; })
-
-static __inline__ int
-__strncpy_from_user(unsigned long __dest, unsigned long __user __src, int __count)
-{
-        __kernel_size_t res;
-        unsigned long __dummy, _d, _s;
-
-        __asm__ __volatile__(
-                "9:\n"
-                "mov.b  @%2+, %1\n\t"
-                "cmp/eq #0, %1\n\t"
-                "bt/s   2f\n"
-                "1:\n"
-                "mov.b  %1, @%3\n\t"
-                "dt     %7\n\t"
-                "bf/s   9b\n\t"
-                " add   #1, %3\n\t"
-                "2:\n\t"
-                "sub    %7, %0\n"
-                "3:\n"
-                ".section .fixup,\"ax\"\n"
-                "4:\n\t"
-                "mov.l  5f, %1\n\t"
-                "jmp    @%1\n\t"
-                " mov   %8, %0\n\t"
-                ".balign 4\n"
-                "5:     .long 3b\n"
-                ".previous\n"
-                ".section __ex_table,\"a\"\n"
-                "       .balign 4\n"
-                "       .long 9b,4b\n"
-                ".previous"
-                : "=r" (res), "=&z" (__dummy), "=r" (_s), "=r" (_d)
-                : "0" (__count), "2" (__src), "3" (__dest), "r" (__count),
-                  "i" (-EFAULT)
-                : "memory", "t");
-
-        return res;
-}
-
-#define strncpy_from_user(dest,src,count) ({ \
-unsigned long __sfu_src = (unsigned long) (src); \
-int __sfu_count = (int) (count); \
-long __sfu_res = -EFAULT; \
-if(__access_ok(__sfu_src, __sfu_count)) { \
-__sfu_res = __strncpy_from_user((unsigned long) (dest), __sfu_src, __sfu_count); \
-} __sfu_res; })
-
-/*
- * Return the size of a string (including the ending 0!)
- */
-static __inline__ long __strnlen_user(const char __user *__s, long __n)
-{
-        unsigned long res;
-        unsigned long __dummy;
-
-        __asm__ __volatile__(
-                "9:\n"
-                "cmp/eq %4, %0\n\t"
-                "bt     2f\n"
-                "1:\t"
-                "mov.b  @(%0,%3), %1\n\t"
-                "tst    %1, %1\n\t"
-                "bf/s   9b\n\t"
-                " add   #1, %0\n"
-                "2:\n"
-                ".section .fixup,\"ax\"\n"
-                "3:\n\t"
-                "mov.l  4f, %1\n\t"
-                "jmp    @%1\n\t"
-                " mov   #0, %0\n"
-                ".balign 4\n"
-                "4:     .long 2b\n"
-                ".previous\n"
-                ".section __ex_table,\"a\"\n"
-                "       .balign 4\n"
-                "       .long 1b,3b\n"
-                ".previous"
-                : "=z" (res), "=&r" (__dummy)
-                : "0" (0), "r" (__s), "r" (__n)
-                : "t");
-        return res;
-}
-
-static __inline__ long strnlen_user(const char __user *s, long n)
-{
-        if (!__addr_ok(s))
-                return 0;
-        else
-                return __strnlen_user(s, n);
-}
-
-#define strlen_user(str)        strnlen_user(str, ~0UL >> 1)
-
-/*
- * The exception table consists of pairs of addresses: the first is the
- * address of an instruction that is allowed to fault, and the second is
- * the address at which the program should continue.  No registers are
- * modified, so it is entirely up to the continuation code to figure out
- * what to do.
- *
- * All the routines below use bits of fixup code that are out of line
- * with the main instruction path.  This means when everything is well,
- * we don't even have to jump over them.  Further, they do not intrude
- * on our cache or tlb entries.
- */
-
-struct exception_table_entry
-{
-        unsigned long insn, fixup;
-};
-
-extern int fixup_exception(struct pt_regs *regs);
-
-#endif /* __ASM_SH_UACCESS_H */
diff --git a/include/asm-sh/uaccess_32.h b/include/asm-sh/uaccess_32.h
new file mode 100644
index 000000000000..b6082f3c1dc4
--- /dev/null
+++ b/include/asm-sh/uaccess_32.h
@@ -0,0 +1,510 @@
+/* $Id: uaccess.h,v 1.11 2003/10/13 07:21:20 lethal Exp $
+ *
+ * User space memory access functions
+ *
+ * Copyright (C) 1999, 2002  Niibe Yutaka
+ * Copyright (C) 2003  Paul Mundt
+ *
+ *  Based on:
+ *     MIPS implementation version 1.15 by
+ *              Copyright (C) 1996, 1997, 1998 by Ralf Baechle
+ *     and i386 version.
+ */
+#ifndef __ASM_SH_UACCESS_H
+#define __ASM_SH_UACCESS_H
+
+#include <linux/errno.h>
+#include <linux/sched.h>
+
+#define VERIFY_READ    0
+#define VERIFY_WRITE   1
+
+/*
+ * The fs value determines whether argument validity checking should be
+ * performed or not.  If get_fs() == USER_DS, checking is performed, with
+ * get_fs() == KERNEL_DS, checking is bypassed.
+ *
+ * For historical reasons (Data Segment Register?), these macros are misnamed.
+ */
+
+#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
+
+#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFFUL)
+#define USER_DS         MAKE_MM_SEG(PAGE_OFFSET)
+
+#define segment_eq(a,b) ((a).seg == (b).seg)
+
+#define get_ds()        (KERNEL_DS)
+
+#if !defined(CONFIG_MMU)
+/* NOMMU is always true */
+#define __addr_ok(addr) (1)
+
+static inline mm_segment_t get_fs(void)
+{
+        return USER_DS;
+}
+
+static inline void set_fs(mm_segment_t s)
+{
+}
+
+/*
+ * __access_ok: Check if address with size is OK or not.
+ *
+ * If we don't have an MMU (or if its disabled) the only thing we really have
+ * to look out for is if the address resides somewhere outside of what
+ * available RAM we have.
+ *
+ * TODO: This check could probably also stand to be restricted somewhat more..
+ * though it still does the Right Thing(tm) for the time being.
+ */
+static inline int __access_ok(unsigned long addr, unsigned long size)
+{
+        return ((addr >= memory_start) && ((addr + size) < memory_end));
+}
+#else /* CONFIG_MMU */
+#define __addr_ok(addr) \
+        ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))
+
+#define get_fs()        (current_thread_info()->addr_limit)
+#define set_fs(x)       (current_thread_info()->addr_limit = (x))
+
+/*
+ * __access_ok: Check if address with size is OK or not.
+ *
+ * Uhhuh, this needs 33-bit arithmetic. We have a carry..
+ *
+ * sum := addr + size;  carry? --> flag = true;
+ * if (sum >= addr_limit) flag = true;
+ */
+static inline int __access_ok(unsigned long addr, unsigned long size)
+{
+        unsigned long flag, sum;
+
+        __asm__("clrt\n\t"
+                "addc   %3, %1\n\t"
+                "movt   %0\n\t"
+                "cmp/hi %4, %1\n\t"
+                "rotcl  %0"
+                :"=&r" (flag), "=r" (sum)
+                :"1" (addr), "r" (size),
+                 "r" (current_thread_info()->addr_limit.seg)
+                :"t");
+        return flag == 0;
+}
+#endif /* CONFIG_MMU */
+
+#define access_ok(type, addr, size)     \
+        (__chk_user_ptr(addr),          \
+         __access_ok((unsigned long __force)(addr), (size)))
+
+/*
+ * Uh, these should become the main single-value transfer routines ...
+ * They automatically use the right size if we just have the right
+ * pointer type ...
+ *
+ * As SuperH uses the same address space for kernel and user data, we
+ * can just do these as direct assignments.
+ *
+ * Careful to not
+ * (a) re-use the arguments for side effects (sizeof is ok)
+ * (b) require any knowledge of processes at this stage
+ */
+#define put_user(x,ptr)         __put_user_check((x), (ptr), sizeof(*(ptr)))
+#define get_user(x,ptr)         __get_user_check((x), (ptr), sizeof(*(ptr)))
+
+/*
+ * The "__xxx" versions do not do address space checking, useful when
+ * doing multiple accesses to the same area (the user has to do the
+ * checks by hand with "access_ok()")
+ */
+#define __put_user(x,ptr)       __put_user_nocheck((x), (ptr), sizeof(*(ptr)))
+#define __get_user(x,ptr)       __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
+
+struct __large_struct { unsigned long buf[100]; };
+#define __m(x) (*(struct __large_struct __user *)(x))
+
+#define __get_user_size(x,ptr,size,retval)                      \
+do {                                                            \
+        retval = 0;                                             \
+        switch (size) {                                         \
+        case 1:                                                 \
+                __get_user_asm(x, ptr, retval, "b");            \
+                break;                                          \
+        case 2:                                                 \
+                __get_user_asm(x, ptr, retval, "w");            \
+                break;                                          \
+        case 4:                                                 \
+                __get_user_asm(x, ptr, retval, "l");            \
+                break;                                          \
+        default:                                                \
+                __get_user_unknown();                           \
+                break;                                          \
+        }                                                       \
+} while (0)
+
+#define __get_user_nocheck(x,ptr,size)                          \
+({                                                              \
+        long __gu_err;                                          \
+        unsigned long __gu_val;                                 \
+        const __typeof__(*(ptr)) __user *__gu_addr = (ptr);     \
+        __chk_user_ptr(ptr);                                    \
+        __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
+        (x) = (__typeof__(*(ptr)))__gu_val;                     \
+        __gu_err;                                               \
+})
+
+#define __get_user_check(x,ptr,size)                                    \
+({                                                                      \
+        long __gu_err = -EFAULT;                                        \
+        unsigned long __gu_val = 0;                                     \
+        const __typeof__(*(ptr)) *__gu_addr = (ptr);                    \
+        if (likely(access_ok(VERIFY_READ, __gu_addr, (size))))          \
+                __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
+        (x) = (__typeof__(*(ptr)))__gu_val;                             \
+        __gu_err;                                                       \
+})
+
+#define __get_user_asm(x, addr, err, insn) \
+({ \
+__asm__ __volatile__( \
+        "1:\n\t" \
+        "mov." insn "   %2, %1\n\t" \
+        "2:\n" \
+        ".section       .fixup,\"ax\"\n" \
+        "3:\n\t" \
+        "mov    #0, %1\n\t" \
+        "mov.l  4f, %0\n\t" \
+        "jmp    @%0\n\t" \
+        " mov   %3, %0\n\t" \
+        ".balign        4\n" \
+        "4:     .long   2b\n\t" \
+        ".previous\n" \
+        ".section       __ex_table,\"a\"\n\t" \
+        ".long  1b, 3b\n\t" \
+        ".previous" \
+        :"=&r" (err), "=&r" (x) \
+        :"m" (__m(addr)), "i" (-EFAULT), "0" (err)); })
+
+extern void __get_user_unknown(void);
+
+#define __put_user_size(x,ptr,size,retval)              \
+do {                                                    \
+        retval = 0;                                     \
+        switch (size) {                                 \
+        case 1:                                         \
+                __put_user_asm(x, ptr, retval, "b");    \
+                break;                                  \
+        case 2:                                         \
+                __put_user_asm(x, ptr, retval, "w");    \
+                break;                                  \
+        case 4:                                         \
+                __put_user_asm(x, ptr, retval, "l");    \
+                break;                                  \
+        case 8:                                         \
+                __put_user_u64(x, ptr, retval);         \
+                break;                                  \
+        default:                                        \
+                __put_user_unknown();                   \
+        }                                               \
+} while (0)
+
+#define __put_user_nocheck(x,ptr,size)                          \
+({                                                              \
+        long __pu_err;                                          \
+        __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
+        __chk_user_ptr(ptr);                                    \
+        __put_user_size((x), __pu_addr, (size), __pu_err);      \
+        __pu_err;                                               \
+})
+
+#define __put_user_check(x,ptr,size)                            \
+({                                                              \
+        long __pu_err = -EFAULT;                                \
+        __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
+        if (likely(access_ok(VERIFY_WRITE, __pu_addr, size)))   \
+                __put_user_size((x), __pu_addr, (size),         \
+                                __pu_err);                      \
+        __pu_err;                                               \
+})
+
+#define __put_user_asm(x, addr, err, insn) \
+({ \
+__asm__ __volatile__( \
+        "1:\n\t" \
+        "mov." insn "   %1, %2\n\t" \
+        "2:\n" \
+        ".section       .fixup,\"ax\"\n" \
+        "3:\n\t" \
+        "mov.l  4f, %0\n\t" \
+        "jmp    @%0\n\t" \
+        " mov   %3, %0\n\t" \
+        ".balign        4\n" \
+        "4:     .long   2b\n\t" \
+        ".previous\n" \
+        ".section       __ex_table,\"a\"\n\t" \
+        ".long  1b, 3b\n\t" \
+        ".previous" \
+        :"=&r" (err) \
+        :"r" (x), "m" (__m(addr)), "i" (-EFAULT), "0" (err)     \
+        :"memory"); })
+
+#if defined(CONFIG_CPU_LITTLE_ENDIAN)
+#define __put_user_u64(val,addr,retval) \
+({ \
+__asm__ __volatile__( \
+        "1:\n\t" \
+        "mov.l  %R1,%2\n\t" \
+        "mov.l  %S1,%T2\n\t" \
+        "2:\n" \
+        ".section       .fixup,\"ax\"\n" \
+        "3:\n\t" \
+        "mov.l  4f,%0\n\t" \
+        "jmp    @%0\n\t" \
+        " mov   %3,%0\n\t" \
+        ".balign        4\n" \
+        "4:     .long   2b\n\t" \
+        ".previous\n" \
+        ".section       __ex_table,\"a\"\n\t" \
+        ".long  1b, 3b\n\t" \
+        ".previous" \
+        : "=r" (retval) \
+        : "r" (val), "m" (__m(addr)), "i" (-EFAULT), "0" (retval) \
+        : "memory"); })
+#else
+#define __put_user_u64(val,addr,retval) \
+({ \
+__asm__ __volatile__( \
+        "1:\n\t" \
+        "mov.l  %S1,%2\n\t" \
+        "mov.l  %R1,%T2\n\t" \
+        "2:\n" \
+        ".section       .fixup,\"ax\"\n" \
+        "3:\n\t" \
+        "mov.l  4f,%0\n\t" \
+        "jmp    @%0\n\t" \
+        " mov   %3,%0\n\t" \
+        ".balign        4\n" \
+        "4:     .long   2b\n\t" \
+        ".previous\n" \
+        ".section       __ex_table,\"a\"\n\t" \
+        ".long  1b, 3b\n\t" \
+        ".previous" \
+        : "=r" (retval) \
+        : "r" (val), "m" (__m(addr)), "i" (-EFAULT), "0" (retval) \
+        : "memory"); })
+#endif
+
+extern void __put_user_unknown(void);
+
+/* Generic arbitrary sized copy.  */
+/* Return the number of bytes NOT copied */
+__kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n);
+
+#define copy_to_user(to,from,n) ({ \
+void *__copy_to = (void *) (to); \
+__kernel_size_t __copy_size = (__kernel_size_t) (n); \
+__kernel_size_t __copy_res; \
+if(__copy_size && __access_ok((unsigned long)__copy_to, __copy_size)) { \
+__copy_res = __copy_user(__copy_to, (void *) (from), __copy_size); \
+} else __copy_res = __copy_size; \
+__copy_res; })
+
+#define copy_from_user(to,from,n) ({ \
+void *__copy_to = (void *) (to); \
+void *__copy_from = (void *) (from); \
+__kernel_size_t __copy_size = (__kernel_size_t) (n); \
+__kernel_size_t __copy_res; \
+if(__copy_size && __access_ok((unsigned long)__copy_from, __copy_size)) { \
+__copy_res = __copy_user(__copy_to, __copy_from, __copy_size); \
+} else __copy_res = __copy_size; \
+__copy_res; })
+
+static __always_inline unsigned long
+__copy_from_user(void *to, const void __user *from, unsigned long n)
+{
+        return __copy_user(to, (__force void *)from, n);
+}
+
+static __always_inline unsigned long __must_check
+__copy_to_user(void __user *to, const void *from, unsigned long n)
+{
+        return __copy_user((__force void *)to, from, n);
+}
+
+#define __copy_to_user_inatomic __copy_to_user
+#define __copy_from_user_inatomic __copy_from_user
+
+/*
+ * Clear the area and return remaining number of bytes
+ * (on failure.  Usually it's 0.)
+ */
+extern __kernel_size_t __clear_user(void *addr, __kernel_size_t size);
+
+#define clear_user(addr,n) ({ \
+void * __cl_addr = (addr); \
+unsigned long __cl_size = (n); \
+if (__cl_size && __access_ok(((unsigned long)(__cl_addr)), __cl_size)) \
+__cl_size = __clear_user(__cl_addr, __cl_size); \
+__cl_size; })
+
+static __inline__ int
+__strncpy_from_user(unsigned long __dest, unsigned long __user __src, int __count)
+{
+        __kernel_size_t res;
+        unsigned long __dummy, _d, _s, _c;
+
+        __asm__ __volatile__(
+                "9:\n"
+                "mov.b  @%2+, %1\n\t"
+                "cmp/eq #0, %1\n\t"
+                "bt/s   2f\n"
+                "1:\n"
+                "mov.b  %1, @%3\n\t"
+                "dt     %4\n\t"
+                "bf/s   9b\n\t"
+                " add   #1, %3\n\t"
+                "2:\n\t"
+                "sub    %4, %0\n"
+                "3:\n"
+                ".section .fixup,\"ax\"\n"
+                "4:\n\t"
+                "mov.l  5f, %1\n\t"
+                "jmp    @%1\n\t"
+                " mov   %9, %0\n\t"
+                ".balign 4\n"
+                "5:     .long 3b\n"
+                ".previous\n"
+                ".section __ex_table,\"a\"\n"
+                "       .balign 4\n"
+                "       .long 9b,4b\n"
+                ".previous"
+                : "=r" (res), "=&z" (__dummy), "=r" (_s), "=r" (_d), "=r"(_c)
+                : "0" (__count), "2" (__src), "3" (__dest), "4" (__count),
+                  "i" (-EFAULT)
+                : "memory", "t");
+
+        return res;
+}
+
+/**
+ * strncpy_from_user: - Copy a NUL terminated string from userspace.
+ * @dst:   Destination address, in kernel space.  This buffer must be at
+ *         least @count bytes long.
+ * @src:   Source address, in user space.
+ * @count: Maximum number of bytes to copy, including the trailing NUL.
+ *
+ * Copies a NUL-terminated string from userspace to kernel space.
+ *
+ * On success, returns the length of the string (not including the trailing
+ * NUL).
+ *
+ * If access to userspace fails, returns -EFAULT (some data may have been
+ * copied).
+ *
+ * If @count is smaller than the length of the string, copies @count bytes
+ * and returns @count.
+ */
+#define strncpy_from_user(dest,src,count) ({ \
+unsigned long __sfu_src = (unsigned long) (src); \
+int __sfu_count = (int) (count); \
+long __sfu_res = -EFAULT; \
+if(__access_ok(__sfu_src, __sfu_count)) { \
+__sfu_res = __strncpy_from_user((unsigned long) (dest), __sfu_src, __sfu_count); \
+} __sfu_res; })
+
+/*
+ * Return the size of a string (including the ending 0 even when we have
+ * exceeded the maximum string length).
+ */
+static __inline__ long __strnlen_user(const char __user *__s, long __n)
+{
+        unsigned long res;
+        unsigned long __dummy;
+
+        __asm__ __volatile__(
+                "1:\t"
+                "mov.b  @(%0,%3), %1\n\t"
+                "cmp/eq %4, %0\n\t"
+                "bt/s   2f\n\t"
+                " add   #1, %0\n\t"
+                "tst    %1, %1\n\t"
+                "bf     1b\n\t"
+                "2:\n"
+                ".section .fixup,\"ax\"\n"
+                "3:\n\t"
+                "mov.l  4f, %1\n\t"
+                "jmp    @%1\n\t"
+                " mov   #0, %0\n"
+                ".balign 4\n"
+                "4:     .long 2b\n"
+                ".previous\n"
+                ".section __ex_table,\"a\"\n"
+                "       .balign 4\n"
+                "       .long 1b,3b\n"
+                ".previous"
+                : "=z" (res), "=&r" (__dummy)
+                : "0" (0), "r" (__s), "r" (__n)
+                : "t");
+        return res;
+}
+
+/**
+ * strnlen_user: - Get the size of a string in user space.
+ * @s: The string to measure.
+ * @n: The maximum valid length
+ *
+ * Context: User context only.  This function may sleep.
+ *
+ * Get the size of a NUL-terminated string in user space.
+ *
+ * Returns the size of the string INCLUDING the terminating NUL.
+ * On exception, returns 0.
+ * If the string is too long, returns a value greater than @n.
+ */
+static __inline__ long strnlen_user(const char __user *s, long n)
+{
+        if (!__addr_ok(s))
+                return 0;
+        else
+                return __strnlen_user(s, n);
+}
+
+/**
+ * strlen_user: - Get the size of a string in user space.
+ * @str: The string to measure.
+ *
+ * Context: User context only.  This function may sleep.
+ *
+ * Get the size of a NUL-terminated string in user space.
+ *
+ * Returns the size of the string INCLUDING the terminating NUL.
+ * On exception, returns 0.
+ *
+ * If there is a limit on the length of a valid string, you may wish to
+ * consider using strnlen_user() instead.
+ */
+#define strlen_user(str)        strnlen_user(str, ~0UL >> 1)
+
+/*
+ * The exception table consists of pairs of addresses: the first is the
+ * address of an instruction that is allowed to fault, and the second is
+ * the address at which the program should continue.  No registers are
+ * modified, so it is entirely up to the continuation code to figure out
+ * what to do.
+ *
+ * All the routines below use bits of fixup code that are out of line
+ * with the main instruction path.  This means when everything is well,
+ * we don't even have to jump over them.  Further, they do not intrude
+ * on our cache or tlb entries.
+ */
+
+struct exception_table_entry
+{
+        unsigned long insn, fixup;
+};
+
+extern int fixup_exception(struct pt_regs *regs);
+
+#endif /* __ASM_SH_UACCESS_H */
diff --git a/include/asm-sh64/uaccess.h b/include/asm-sh/uaccess_64.h
index 644c67b65f94..d54ec082d25a 100644
--- a/include/asm-sh64/uaccess.h
+++ b/include/asm-sh/uaccess_64.h
@@ -1,12 +1,8 @@
-#ifndef __ASM_SH64_UACCESS_H
-#define __ASM_SH64_UACCESS_H
+#ifndef __ASM_SH_UACCESS_64_H
+#define __ASM_SH_UACCESS_64_H
 
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/uaccess.h
+ * include/asm-sh/uaccess_64.h
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003, 2004  Paul Mundt
@@ -20,8 +16,10 @@
  *              Copyright (C) 1996, 1997, 1998 by Ralf Baechle
  *     and i386 version.
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #include <linux/errno.h>
 #include <linux/sched.h>
 
@@ -297,20 +295,8 @@ struct exception_table_entry
 
 #define ARCH_HAS_SEARCH_EXTABLE
 
-/* If gcc inlines memset, it will use st.q instructions.  Therefore, we need
-   kmalloc allocations to be 8-byte aligned.  Without this, the alignment
-   becomes BYTE_PER_WORD i.e. only 4 (since sizeof(long)==sizeof(void*)==4 on
-   sh64 at the moment). */
-#define ARCH_KMALLOC_MINALIGN 8
-
-/*
- * We want 8-byte alignment for the slab caches as well, otherwise we have
- * the same BYTES_PER_WORD (sizeof(void *)) min align in kmem_cache_create().
- */
-#define ARCH_SLAB_MINALIGN 8
-
 /* Returns 0 if exception not found and fixup.unit otherwise.  */
 extern unsigned long search_exception_table(unsigned long addr);
 extern const struct exception_table_entry *search_exception_tables (unsigned long addr);
 
-#endif /* __ASM_SH64_UACCESS_H */
+#endif /* __ASM_SH_UACCESS_64_H */
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h
index b182b1cb05fd..4b21f369c28c 100644
--- a/include/asm-sh/unistd.h
+++ b/include/asm-sh/unistd.h
@@ -1,376 +1,5 @@
-#ifndef __ASM_SH_UNISTD_H
-#define __ASM_SH_UNISTD_H
-
-/*
- * Copyright (C) 1999  Niibe Yutaka
- */
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_restart_syscall      0
-#define __NR_exit                 1
-#define __NR_fork                 2
-#define __NR_read                 3
-#define __NR_write                4
-#define __NR_open                 5
-#define __NR_close                6
-#define __NR_waitpid              7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_time                13
-#define __NR_mknod               14
-#define __NR_chmod               15
-#define __NR_lchown              16
-#define __NR_break               17
-#define __NR_oldstat             18
-#define __NR_lseek               19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount              22
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
-#define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_oldfstat            28
-#define __NR_pause               29
-#define __NR_utime               30
-#define __NR_stty                31
-#define __NR_gtty                32
-#define __NR_access              33
-#define __NR_nice                34
-#define __NR_ftime               35
-#define __NR_sync                36
-#define __NR_kill                37
-#define __NR_rename              38
-#define __NR_mkdir               39
-#define __NR_rmdir               40
-#define __NR_dup                 41
-#define __NR_pipe                42
-#define __NR_times               43
-#define __NR_prof                44
-#define __NR_brk                 45
-#define __NR_setgid              46
-#define __NR_getgid              47
-#define __NR_signal              48
-#define __NR_geteuid             49
-#define __NR_getegid             50
-#define __NR_acct                51
-#define __NR_umount2             52
-#define __NR_lock                53
-#define __NR_ioctl               54
-#define __NR_fcntl               55
-#define __NR_mpx                 56
-#define __NR_setpgid             57
-#define __NR_ulimit              58
-#define __NR_oldolduname         59
-#define __NR_umask               60
-#define __NR_chroot              61
-#define __NR_ustat               62
-#define __NR_dup2                63
-#define __NR_getppid             64
-#define __NR_getpgrp             65
-#define __NR_setsid              66
-#define __NR_sigaction           67
-#define __NR_sgetmask            68
-#define __NR_ssetmask            69
-#define __NR_setreuid            70
-#define __NR_setregid            71
-#define __NR_sigsuspend          72
-#define __NR_sigpending          73
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-#define __NR_getgroups           80
-#define __NR_setgroups           81
-#define __NR_select              82
-#define __NR_symlink             83
-#define __NR_oldlstat            84
-#define __NR_readlink            85
-#define __NR_uselib              86
-#define __NR_swapon              87
-#define __NR_reboot              88
-#define __NR_readdir             89
-#define __NR_mmap                90
-#define __NR_munmap              91
-#define __NR_truncate            92
-#define __NR_ftruncate           93
-#define __NR_fchmod              94
-#define __NR_fchown              95
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-#define __NR_profil              98
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-#define __NR_ioperm             101
-#define __NR_socketcall         102
-#define __NR_syslog             103
-#define __NR_setitimer          104
-#define __NR_getitimer          105
-#define __NR_stat               106
-#define __NR_lstat              107
-#define __NR_fstat              108
-#define __NR_olduname           109
-#define __NR_iopl               110
-#define __NR_vhangup            111
-#define __NR_idle               112
-#define __NR_vm86old            113
-#define __NR_wait4              114
-#define __NR_swapoff            115
-#define __NR_sysinfo            116
-#define __NR_ipc                117
-#define __NR_fsync              118
-#define __NR_sigreturn          119
-#define __NR_clone              120
-#define __NR_setdomainname      121
-#define __NR_uname              122
-#define __NR_modify_ldt         123
-#define __NR_adjtimex           124
-#define __NR_mprotect           125
-#define __NR_sigprocmask        126
-#define __NR_create_module      127
-#define __NR_init_module        128
-#define __NR_delete_module      129
-#define __NR_get_kernel_syms    130
-#define __NR_quotactl           131
-#define __NR_getpgid            132
-#define __NR_fchdir             133
-#define __NR_bdflush            134
-#define __NR_sysfs              135
-#define __NR_personality        136
-#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
-#define __NR_setfsuid           138
-#define __NR_setfsgid           139
-#define __NR__llseek            140
-#define __NR_getdents           141
-#define __NR__newselect         142
-#define __NR_flock              143
-#define __NR_msync              144
-#define __NR_readv              145
-#define __NR_writev             146
-#define __NR_getsid             147
-#define __NR_fdatasync          148
-#define __NR__sysctl            149
-#define __NR_mlock              150
-#define __NR_munlock            151
-#define __NR_mlockall           152
-#define __NR_munlockall         153
-#define __NR_sched_setparam             154
-#define __NR_sched_getparam             155
-#define __NR_sched_setscheduler         156
-#define __NR_sched_getscheduler         157
-#define __NR_sched_yield                158
-#define __NR_sched_get_priority_max     159
-#define __NR_sched_get_priority_min     160
-#define __NR_sched_rr_get_interval      161
-#define __NR_nanosleep          162
-#define __NR_mremap             163
-#define __NR_setresuid          164
-#define __NR_getresuid          165
-#define __NR_vm86               166
-#define __NR_query_module       167
-#define __NR_poll               168
-#define __NR_nfsservctl         169
-#define __NR_setresgid          170
-#define __NR_getresgid          171
-#define __NR_prctl              172
-#define __NR_rt_sigreturn       173
-#define __NR_rt_sigaction       174
-#define __NR_rt_sigprocmask     175
-#define __NR_rt_sigpending      176
-#define __NR_rt_sigtimedwait    177
-#define __NR_rt_sigqueueinfo    178
-#define __NR_rt_sigsuspend      179
-#define __NR_pread64            180
-#define __NR_pwrite64           181
-#define __NR_chown              182
-#define __NR_getcwd             183
-#define __NR_capget             184
-#define __NR_capset             185
-#define __NR_sigaltstack        186
-#define __NR_sendfile           187
-#define __NR_streams1           188     /* some people actually want it */
-#define __NR_streams2           189     /* some people actually want it */
-#define __NR_vfork              190
-#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
-#define __NR_mmap2              192
-#define __NR_truncate64         193
-#define __NR_ftruncate64        194
-#define __NR_stat64             195
-#define __NR_lstat64            196
-#define __NR_fstat64            197
-#define __NR_lchown32           198
-#define __NR_getuid32           199
-#define __NR_getgid32           200
-#define __NR_geteuid32          201
-#define __NR_getegid32          202
-#define __NR_setreuid32         203
-#define __NR_setregid32         204
-#define __NR_getgroups32        205
-#define __NR_setgroups32        206
-#define __NR_fchown32           207
-#define __NR_setresuid32        208
-#define __NR_getresuid32        209
-#define __NR_setresgid32        210
-#define __NR_getresgid32        211
-#define __NR_chown32            212
-#define __NR_setuid32           213
-#define __NR_setgid32           214
-#define __NR_setfsuid32         215
-#define __NR_setfsgid32         216
-#define __NR_pivot_root         217
-#define __NR_mincore            218
-#define __NR_madvise            219
-#define __NR_getdents64         220
-#define __NR_fcntl64            221
-/* 223 is unused */
-#define __NR_gettid             224
-#define __NR_readahead          225
-#define __NR_setxattr           226
-#define __NR_lsetxattr          227
-#define __NR_fsetxattr          228
-#define __NR_getxattr           229
-#define __NR_lgetxattr          230
-#define __NR_fgetxattr          231
-#define __NR_listxattr          232
-#define __NR_llistxattr         233
-#define __NR_flistxattr         234
-#define __NR_removexattr        235
-#define __NR_lremovexattr       236
-#define __NR_fremovexattr       237
-#define __NR_tkill              238
-#define __NR_sendfile64         239
-#define __NR_futex              240
-#define __NR_sched_setaffinity  241
-#define __NR_sched_getaffinity  242
-#define __NR_set_thread_area    243
-#define __NR_get_thread_area    244
-#define __NR_io_setup           245
-#define __NR_io_destroy         246
-#define __NR_io_getevents       247
-#define __NR_io_submit          248
-#define __NR_io_cancel          249
-#define __NR_fadvise64          250
-
-#define __NR_exit_group         252
-#define __NR_lookup_dcookie     253
-#define __NR_epoll_create       254
-#define __NR_epoll_ctl          255
-#define __NR_epoll_wait         256
-#define __NR_remap_file_pages   257
-#define __NR_set_tid_address    258
-#define __NR_timer_create       259
-#define __NR_timer_settime      (__NR_timer_create+1)
-#define __NR_timer_gettime      (__NR_timer_create+2)
-#define __NR_timer_getoverrun   (__NR_timer_create+3)
-#define __NR_timer_delete       (__NR_timer_create+4)
-#define __NR_clock_settime      (__NR_timer_create+5)
-#define __NR_clock_gettime      (__NR_timer_create+6)
-#define __NR_clock_getres       (__NR_timer_create+7)
-#define __NR_clock_nanosleep    (__NR_timer_create+8)
-#define __NR_statfs64           268
-#define __NR_fstatfs64          269
-#define __NR_tgkill             270
-#define __NR_utimes             271
-#define __NR_fadvise64_64       272
-#define __NR_vserver            273
-#define __NR_mbind              274
-#define __NR_get_mempolicy      275
-#define __NR_set_mempolicy      276
-#define __NR_mq_open            277
-#define __NR_mq_unlink          (__NR_mq_open+1)
-#define __NR_mq_timedsend       (__NR_mq_open+2)
-#define __NR_mq_timedreceive    (__NR_mq_open+3)
-#define __NR_mq_notify          (__NR_mq_open+4)
-#define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_kexec_load         283
-#define __NR_waitid             284
-#define __NR_add_key            285
-#define __NR_request_key        286
-#define __NR_keyctl             287
-#define __NR_ioprio_set         288
-#define __NR_ioprio_get         289
-#define __NR_inotify_init       290
-#define __NR_inotify_add_watch  291
-#define __NR_inotify_rm_watch   292
-/* 293 is unused */
-#define __NR_migrate_pages      294
-#define __NR_openat             295
-#define __NR_mkdirat            296
-#define __NR_mknodat            297
-#define __NR_fchownat           298
-#define __NR_futimesat          299
-#define __NR_fstatat64          300
-#define __NR_unlinkat           301
-#define __NR_renameat           302
-#define __NR_linkat             303
-#define __NR_symlinkat          304
-#define __NR_readlinkat         305
-#define __NR_fchmodat           306
-#define __NR_faccessat          307
-#define __NR_pselect6           308
-#define __NR_ppoll              309
-#define __NR_unshare            310
-#define __NR_set_robust_list    311
-#define __NR_get_robust_list    312
-#define __NR_splice             313
-#define __NR_sync_file_range    314
-#define __NR_tee                315
-#define __NR_vmsplice           316
-#define __NR_move_pages         317
-#define __NR_getcpu             318
-#define __NR_epoll_pwait        319
-#define __NR_utimensat          320
-#define __NR_signalfd           321
-#define __NR_timerfd            322
-#define __NR_eventfd            323
-#define __NR_fallocate          324
-
-#define NR_syscalls 325
-
-#ifdef __KERNEL__
-
-#define __ARCH_WANT_IPC_PARSE_VERSION
-#define __ARCH_WANT_OLD_READDIR
-#define __ARCH_WANT_OLD_STAT
-#define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_ALARM
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_SGETMASK
-#define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_WAITPID
-#define __ARCH_WANT_SYS_SOCKETCALL
-#define __ARCH_WANT_SYS_FADVISE64
-#define __ARCH_WANT_SYS_GETPGRP
-#define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_NICE
-#define __ARCH_WANT_SYS_OLD_GETRLIMIT
-#define __ARCH_WANT_SYS_OLDUMOUNT
-#define __ARCH_WANT_SYS_SIGPENDING
-#define __ARCH_WANT_SYS_SIGPROCMASK
-#define __ARCH_WANT_SYS_RT_SIGACTION
-#define __ARCH_WANT_SYS_RT_SIGSUSPEND
-
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+#ifdef CONFIG_SUPERH32
+# include "unistd_32.h"
+#else
+# include "unistd_64.h"
 #endif
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_SH_UNISTD_H */
diff --git a/include/asm-sh/unistd_32.h b/include/asm-sh/unistd_32.h
new file mode 100644
index 000000000000..b182b1cb05fd
--- /dev/null
+++ b/include/asm-sh/unistd_32.h
@@ -0,0 +1,376 @@
+#ifndef __ASM_SH_UNISTD_H
+#define __ASM_SH_UNISTD_H
+
+/*
+ * Copyright (C) 1999  Niibe Yutaka
+ */
+
+/*
+ * This file contains the system call numbers.
+ */
+
+#define __NR_restart_syscall      0
+#define __NR_exit                 1
+#define __NR_fork                 2
+#define __NR_read                 3
+#define __NR_write                4
+#define __NR_open                 5
+#define __NR_close                6
+#define __NR_waitpid              7
+#define __NR_creat                8
+#define __NR_link                 9
+#define __NR_unlink              10
+#define __NR_execve              11
+#define __NR_chdir               12
+#define __NR_time                13
+#define __NR_mknod               14
+#define __NR_chmod               15
+#define __NR_lchown              16
+#define __NR_break               17
+#define __NR_oldstat             18
+#define __NR_lseek               19
+#define __NR_getpid              20
+#define __NR_mount               21
+#define __NR_umount              22
+#define __NR_setuid              23
+#define __NR_getuid              24
+#define __NR_stime               25
+#define __NR_ptrace              26
+#define __NR_alarm               27
+#define __NR_oldfstat            28
+#define __NR_pause               29
+#define __NR_utime               30
+#define __NR_stty                31
+#define __NR_gtty                32
+#define __NR_access              33
+#define __NR_nice                34
+#define __NR_ftime               35
+#define __NR_sync                36
+#define __NR_kill                37
+#define __NR_rename              38
+#define __NR_mkdir               39
+#define __NR_rmdir               40
+#define __NR_dup                 41
+#define __NR_pipe                42
+#define __NR_times               43
+#define __NR_prof                44
+#define __NR_brk                 45
+#define __NR_setgid              46
+#define __NR_getgid              47
+#define __NR_signal              48
+#define __NR_geteuid             49
+#define __NR_getegid             50
+#define __NR_acct                51
+#define __NR_umount2             52
+#define __NR_lock                53
+#define __NR_ioctl               54
+#define __NR_fcntl               55
+#define __NR_mpx                 56
+#define __NR_setpgid             57
+#define __NR_ulimit              58
+#define __NR_oldolduname         59
+#define __NR_umask               60
+#define __NR_chroot              61
+#define __NR_ustat               62
+#define __NR_dup2                63
+#define __NR_getppid             64
+#define __NR_getpgrp             65
+#define __NR_setsid              66
+#define __NR_sigaction           67
+#define __NR_sgetmask            68
+#define __NR_ssetmask            69
+#define __NR_setreuid            70
+#define __NR_setregid            71
+#define __NR_sigsuspend          72
+#define __NR_sigpending          73
+#define __NR_sethostname         74
+#define __NR_setrlimit           75
+#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
+#define __NR_getrusage           77
+#define __NR_gettimeofday        78
+#define __NR_settimeofday        79
+#define __NR_getgroups           80
+#define __NR_setgroups           81
+#define __NR_select              82
+#define __NR_symlink             83
+#define __NR_oldlstat            84
+#define __NR_readlink            85
+#define __NR_uselib              86
+#define __NR_swapon              87
+#define __NR_reboot              88
+#define __NR_readdir             89
+#define __NR_mmap                90
+#define __NR_munmap              91
+#define __NR_truncate            92
+#define __NR_ftruncate           93
+#define __NR_fchmod              94
+#define __NR_fchown              95
+#define __NR_getpriority         96
+#define __NR_setpriority         97
+#define __NR_profil              98
+#define __NR_statfs              99
+#define __NR_fstatfs            100
+#define __NR_ioperm             101
+#define __NR_socketcall         102
+#define __NR_syslog             103
+#define __NR_setitimer          104
+#define __NR_getitimer          105
+#define __NR_stat               106
+#define __NR_lstat              107
+#define __NR_fstat              108
+#define __NR_olduname           109
+#define __NR_iopl               110
+#define __NR_vhangup            111
+#define __NR_idle               112
+#define __NR_vm86old            113
+#define __NR_wait4              114
+#define __NR_swapoff            115
+#define __NR_sysinfo            116
+#define __NR_ipc                117
+#define __NR_fsync              118
+#define __NR_sigreturn          119
+#define __NR_clone              120
+#define __NR_setdomainname      121
+#define __NR_uname              122
+#define __NR_modify_ldt         123
+#define __NR_adjtimex           124
+#define __NR_mprotect           125
+#define __NR_sigprocmask        126
+#define __NR_create_module      127
+#define __NR_init_module        128
+#define __NR_delete_module      129
+#define __NR_get_kernel_syms    130
+#define __NR_quotactl           131
+#define __NR_getpgid            132
+#define __NR_fchdir             133
+#define __NR_bdflush            134
+#define __NR_sysfs              135
+#define __NR_personality        136
+#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
+#define __NR_setfsuid           138
+#define __NR_setfsgid           139
+#define __NR__llseek            140
+#define __NR_getdents           141
+#define __NR__newselect         142
+#define __NR_flock              143
+#define __NR_msync              144
+#define __NR_readv              145
+#define __NR_writev             146
+#define __NR_getsid             147
+#define __NR_fdatasync          148
+#define __NR__sysctl            149
+#define __NR_mlock              150
+#define __NR_munlock            151
+#define __NR_mlockall           152
+#define __NR_munlockall         153
+#define __NR_sched_setparam             154
+#define __NR_sched_getparam             155
+#define __NR_sched_setscheduler         156
+#define __NR_sched_getscheduler         157
+#define __NR_sched_yield                158
+#define __NR_sched_get_priority_max     159
+#define __NR_sched_get_priority_min     160
+#define __NR_sched_rr_get_interval      161
+#define __NR_nanosleep          162
+#define __NR_mremap             163
+#define __NR_setresuid          164
+#define __NR_getresuid          165
+#define __NR_vm86               166
+#define __NR_query_module       167
+#define __NR_poll               168
+#define __NR_nfsservctl         169
+#define __NR_setresgid          170
+#define __NR_getresgid          171
+#define __NR_prctl              172
+#define __NR_rt_sigreturn       173
+#define __NR_rt_sigaction       174
+#define __NR_rt_sigprocmask     175
+#define __NR_rt_sigpending      176
+#define __NR_rt_sigtimedwait    177
+#define __NR_rt_sigqueueinfo    178
+#define __NR_rt_sigsuspend      179
+#define __NR_pread64            180
+#define __NR_pwrite64           181
+#define __NR_chown              182
+#define __NR_getcwd             183
+#define __NR_capget             184
+#define __NR_capset             185
+#define __NR_sigaltstack        186
+#define __NR_sendfile           187
+#define __NR_streams1           188     /* some people actually want it */
+#define __NR_streams2           189     /* some people actually want it */
+#define __NR_vfork              190
+#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
+#define __NR_mmap2              192
+#define __NR_truncate64         193
+#define __NR_ftruncate64        194
+#define __NR_stat64             195
+#define __NR_lstat64            196
+#define __NR_fstat64            197
+#define __NR_lchown32           198
+#define __NR_getuid32           199
+#define __NR_getgid32           200
+#define __NR_geteuid32          201
+#define __NR_getegid32          202
+#define __NR_setreuid32         203
+#define __NR_setregid32         204
+#define __NR_getgroups32        205
+#define __NR_setgroups32        206
+#define __NR_fchown32           207
+#define __NR_setresuid32        208
+#define __NR_getresuid32        209
+#define __NR_setresgid32        210
+#define __NR_getresgid32        211
+#define __NR_chown32            212
+#define __NR_setuid32           213
+#define __NR_setgid32           214
+#define __NR_setfsuid32         215
+#define __NR_setfsgid32         216
+#define __NR_pivot_root         217
+#define __NR_mincore            218
+#define __NR_madvise            219
+#define __NR_getdents64         220
+#define __NR_fcntl64            221
+/* 223 is unused */
+#define __NR_gettid             224
+#define __NR_readahead          225
+#define __NR_setxattr           226
+#define __NR_lsetxattr          227
+#define __NR_fsetxattr          228
+#define __NR_getxattr           229
+#define __NR_lgetxattr          230
+#define __NR_fgetxattr          231
+#define __NR_listxattr          232
+#define __NR_llistxattr         233
+#define __NR_flistxattr         234
+#define __NR_removexattr        235
+#define __NR_lremovexattr       236
+#define __NR_fremovexattr       237
+#define __NR_tkill              238
+#define __NR_sendfile64         239
+#define __NR_futex              240
+#define __NR_sched_setaffinity  241
+#define __NR_sched_getaffinity  242
+#define __NR_set_thread_area    243
+#define __NR_get_thread_area    244
+#define __NR_io_setup           245
+#define __NR_io_destroy         246
+#define __NR_io_getevents       247
+#define __NR_io_submit          248
+#define __NR_io_cancel          249
+#define __NR_fadvise64          250
+
+#define __NR_exit_group         252
+#define __NR_lookup_dcookie     253
+#define __NR_epoll_create       254
+#define __NR_epoll_ctl          255
+#define __NR_epoll_wait         256
+#define __NR_remap_file_pages   257
+#define __NR_set_tid_address    258
+#define __NR_timer_create       259
+#define __NR_timer_settime      (__NR_timer_create+1)
+#define __NR_timer_gettime      (__NR_timer_create+2)
+#define __NR_timer_getoverrun   (__NR_timer_create+3)
+#define __NR_timer_delete       (__NR_timer_create+4)
+#define __NR_clock_settime      (__NR_timer_create+5)
+#define __NR_clock_gettime      (__NR_timer_create+6)
+#define __NR_clock_getres       (__NR_timer_create+7)
+#define __NR_clock_nanosleep    (__NR_timer_create+8)
+#define __NR_statfs64           268
+#define __NR_fstatfs64          269
+#define __NR_tgkill             270
+#define __NR_utimes             271
+#define __NR_fadvise64_64       272
+#define __NR_vserver            273
+#define __NR_mbind              274
+#define __NR_get_mempolicy      275
+#define __NR_set_mempolicy      276
+#define __NR_mq_open            277
+#define __NR_mq_unlink          (__NR_mq_open+1)
+#define __NR_mq_timedsend       (__NR_mq_open+2)
+#define __NR_mq_timedreceive    (__NR_mq_open+3)
+#define __NR_mq_notify          (__NR_mq_open+4)
+#define __NR_mq_getsetattr      (__NR_mq_open+5)
+#define __NR_kexec_load         283
+#define __NR_waitid             284
+#define __NR_add_key            285
+#define __NR_request_key        286
+#define __NR_keyctl             287
+#define __NR_ioprio_set         288
+#define __NR_ioprio_get         289
+#define __NR_inotify_init       290
+#define __NR_inotify_add_watch  291
+#define __NR_inotify_rm_watch   292
+/* 293 is unused */
+#define __NR_migrate_pages      294
+#define __NR_openat             295
+#define __NR_mkdirat            296
+#define __NR_mknodat            297
+#define __NR_fchownat           298
+#define __NR_futimesat          299
+#define __NR_fstatat64          300
+#define __NR_unlinkat           301
+#define __NR_renameat           302
+#define __NR_linkat             303
+#define __NR_symlinkat          304
+#define __NR_readlinkat         305
+#define __NR_fchmodat           306
+#define __NR_faccessat          307
+#define __NR_pselect6           308
+#define __NR_ppoll              309
+#define __NR_unshare            310
+#define __NR_set_robust_list    311
+#define __NR_get_robust_list    312
+#define __NR_splice             313
+#define __NR_sync_file_range    314
+#define __NR_tee                315
+#define __NR_vmsplice           316
+#define __NR_move_pages         317
+#define __NR_getcpu             318
+#define __NR_epoll_pwait        319
+#define __NR_utimensat          320
+#define __NR_signalfd           321
+#define __NR_timerfd            322
+#define __NR_eventfd            323
+#define __NR_fallocate          324
+
+#define NR_syscalls 325
+
+#ifdef __KERNEL__
+
+#define __ARCH_WANT_IPC_PARSE_VERSION
+#define __ARCH_WANT_OLD_READDIR
+#define __ARCH_WANT_OLD_STAT
+#define __ARCH_WANT_STAT64
+#define __ARCH_WANT_SYS_ALARM
+#define __ARCH_WANT_SYS_GETHOSTNAME
+#define __ARCH_WANT_SYS_PAUSE
+#define __ARCH_WANT_SYS_SGETMASK
+#define __ARCH_WANT_SYS_SIGNAL
+#define __ARCH_WANT_SYS_TIME
+#define __ARCH_WANT_SYS_UTIME
+#define __ARCH_WANT_SYS_WAITPID
+#define __ARCH_WANT_SYS_SOCKETCALL
+#define __ARCH_WANT_SYS_FADVISE64
+#define __ARCH_WANT_SYS_GETPGRP
+#define __ARCH_WANT_SYS_LLSEEK
+#define __ARCH_WANT_SYS_NICE
+#define __ARCH_WANT_SYS_OLD_GETRLIMIT
+#define __ARCH_WANT_SYS_OLDUMOUNT
+#define __ARCH_WANT_SYS_SIGPENDING
+#define __ARCH_WANT_SYS_SIGPROCMASK
+#define __ARCH_WANT_SYS_RT_SIGACTION
+#define __ARCH_WANT_SYS_RT_SIGSUSPEND
+
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#ifndef cond_syscall
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+#endif
+
+#endif /* __KERNEL__ */
+#endif /* __ASM_SH_UNISTD_H */
diff --git a/include/asm-sh64/unistd.h b/include/asm-sh/unistd_64.h
index 1a5197f369b2..944511882cac 100644
--- a/include/asm-sh64/unistd.h
+++ b/include/asm-sh/unistd_64.h
@@ -1,21 +1,19 @@
-#ifndef __ASM_SH64_UNISTD_H
-#define __ASM_SH64_UNISTD_H
+#ifndef __ASM_SH_UNISTD_64_H
+#define __ASM_SH_UNISTD_64_H
 
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
+ * include/asm-sh/unistd_64.h
  *
- * include/asm-sh64/unistd.h
+ * This file contains the system call numbers.
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003 - 2007 Paul Mundt
  * Copyright (C) 2004  Sean McGoogan
  *
- * This file contains the system call numbers.
- *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #define __NR_restart_syscall      0
 #define __NR_exit                 1
 #define __NR_fork                 2
@@ -414,4 +412,4 @@
 #endif
 
 #endif /* __KERNEL__ */
-#endif /* __ASM_SH64_UNISTD_H */
+#endif /* __ASM_SH_UNISTD_64_H */
diff --git a/include/asm-sh/user.h b/include/asm-sh/user.h
index d1b8511d9d9f..1a4f43c75126 100644
--- a/include/asm-sh/user.h
+++ b/include/asm-sh/user.h
@@ -27,12 +27,19 @@
  *      to write an integer number of pages.
  */
 
+#if defined(__SH5__) || defined(CONFIG_CPU_SH5)
+struct user_fpu_struct {
+        unsigned long fp_regs[32];
+        unsigned int fpscr;
+};
+#else
 struct user_fpu_struct {
         unsigned long fp_regs[16];
         unsigned long xfp_regs[16];
         unsigned long fpscr;
         unsigned long fpul;
 };
+#endif
 
 struct user {
         struct pt_regs  regs;                   /* entire machine state */
diff --git a/include/asm-sh/voyagergx.h b/include/asm-sh/voyagergx.h
deleted file mode 100644
index d825596562df..000000000000
--- a/include/asm-sh/voyagergx.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/* -------------------------------------------------------------------- */
-/* voyagergx.h                                                        */
-/* -------------------------------------------------------------------- */
-/*  This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    Copyright 2003 (c) Lineo uSolutions,Inc.
-*/
-/* -------------------------------------------------------------------- */
-
-#ifndef _VOYAGER_GX_REG_H
-#define _VOYAGER_GX_REG_H
-
-#define VOYAGER_BASE                    0xb3e00000
-#define VOYAGER_USBH_BASE               (0x40000 + VOYAGER_BASE)
-#define VOYAGER_UART_BASE               (0x30000 + VOYAGER_BASE)
-#define VOYAGER_AC97_BASE               (0xa0000 + VOYAGER_BASE)
-
-#define VOYAGER_IRQ_NUM                 26
-#define VOYAGER_IRQ_BASE                200
-
-#define IRQ_SM501_UP                    (VOYAGER_IRQ_BASE + 0)
-#define IRQ_SM501_G54                   (VOYAGER_IRQ_BASE + 1)
-#define IRQ_SM501_G53                   (VOYAGER_IRQ_BASE + 2)
-#define IRQ_SM501_G52                   (VOYAGER_IRQ_BASE + 3)
-#define IRQ_SM501_G51                   (VOYAGER_IRQ_BASE + 4)
-#define IRQ_SM501_G50                   (VOYAGER_IRQ_BASE + 5)
-#define IRQ_SM501_G49                   (VOYAGER_IRQ_BASE + 6)
-#define IRQ_SM501_G48                   (VOYAGER_IRQ_BASE + 7)
-#define IRQ_SM501_I2C                   (VOYAGER_IRQ_BASE + 8)
-#define IRQ_SM501_PW                    (VOYAGER_IRQ_BASE + 9)
-#define IRQ_SM501_DMA                   (VOYAGER_IRQ_BASE + 10)
-#define IRQ_SM501_PCI                   (VOYAGER_IRQ_BASE + 11)
-#define IRQ_SM501_I2S                   (VOYAGER_IRQ_BASE + 12)
-#define IRQ_SM501_AC                    (VOYAGER_IRQ_BASE + 13)
-#define IRQ_SM501_US                    (VOYAGER_IRQ_BASE + 14)
-#define IRQ_SM501_U1                    (VOYAGER_IRQ_BASE + 15)
-#define IRQ_SM501_U0                    (VOYAGER_IRQ_BASE + 16)
-#define IRQ_SM501_CV                    (VOYAGER_IRQ_BASE + 17)
-#define IRQ_SM501_MC                    (VOYAGER_IRQ_BASE + 18)
-#define IRQ_SM501_S1                    (VOYAGER_IRQ_BASE + 19)
-#define IRQ_SM501_S0                    (VOYAGER_IRQ_BASE + 20)
-#define IRQ_SM501_UH                    (VOYAGER_IRQ_BASE + 21)
-#define IRQ_SM501_2D                    (VOYAGER_IRQ_BASE + 22)
-#define IRQ_SM501_ZD                    (VOYAGER_IRQ_BASE + 23)
-#define IRQ_SM501_PV                    (VOYAGER_IRQ_BASE + 24)
-#define IRQ_SM501_CI                    (VOYAGER_IRQ_BASE + 25)
-
-/* ----- MISC controle  register ------------------------------ */
-#define MISC_CTRL                       (0x000004 + VOYAGER_BASE)
-#define MISC_CTRL_USBCLK_48             (3 << 28)
-#define MISC_CTRL_USBCLK_96             (2 << 28)
-#define MISC_CTRL_USBCLK_CRYSTAL        (1 << 28)
-
-/* ----- GPIO[31:0] register --------------------------------- */
-#define GPIO_MUX_LOW                    (0x000008 + VOYAGER_BASE)
-#define GPIO_MUX_LOW_AC97               0x1F000000
-#define GPIO_MUX_LOW_8051               0x0000ffff
-#define GPIO_MUX_LOW_PWM                (1 << 29)
-
-/* ----- GPIO[63:32] register --------------------------------- */
-#define GPIO_MUX_HIGH                   (0x00000C + VOYAGER_BASE)
-
-/* ----- DRAM controle  register ------------------------------- */
-#define DRAM_CTRL                       (0x000010 + VOYAGER_BASE)
-#define DRAM_CTRL_EMBEDDED              (1 << 31)
-#define DRAM_CTRL_CPU_BURST_1           (0 << 28)
-#define DRAM_CTRL_CPU_BURST_2           (1 << 28)
-#define DRAM_CTRL_CPU_BURST_4           (2 << 28)
-#define DRAM_CTRL_CPU_BURST_8           (3 << 28)
-#define DRAM_CTRL_CPU_CAS_LATENCY       (1 << 27)
-#define DRAM_CTRL_CPU_SIZE_2            (0 << 24)
-#define DRAM_CTRL_CPU_SIZE_4            (1 << 24)
-#define DRAM_CTRL_CPU_SIZE_64           (4 << 24)
-#define DRAM_CTRL_CPU_SIZE_32           (5 << 24)
-#define DRAM_CTRL_CPU_SIZE_16           (6 << 24)
-#define DRAM_CTRL_CPU_SIZE_8            (7 << 24)
-#define DRAM_CTRL_CPU_COLUMN_SIZE_1024  (0 << 22)
-#define DRAM_CTRL_CPU_COLUMN_SIZE_512   (2 << 22)
-#define DRAM_CTRL_CPU_COLUMN_SIZE_256   (3 << 22)
-#define DRAM_CTRL_CPU_ACTIVE_PRECHARGE  (1 << 21)
-#define DRAM_CTRL_CPU_RESET             (1 << 20)
-#define DRAM_CTRL_CPU_BANKS             (1 << 19)
-#define DRAM_CTRL_CPU_WRITE_PRECHARGE   (1 << 18)
-#define DRAM_CTRL_BLOCK_WRITE           (1 << 17)
-#define DRAM_CTRL_REFRESH_COMMAND       (1 << 16)
-#define DRAM_CTRL_SIZE_4                (0 << 13)
-#define DRAM_CTRL_SIZE_8                (1 << 13)
-#define DRAM_CTRL_SIZE_16               (2 << 13)
-#define DRAM_CTRL_SIZE_32               (3 << 13)
-#define DRAM_CTRL_SIZE_64               (4 << 13)
-#define DRAM_CTRL_SIZE_2                (5 << 13)
-#define DRAM_CTRL_COLUMN_SIZE_256       (0 << 11)
-#define DRAM_CTRL_COLUMN_SIZE_512       (2 << 11)
-#define DRAM_CTRL_COLUMN_SIZE_1024      (3 << 11)
-#define DRAM_CTRL_BLOCK_WRITE_TIME      (1 << 10)
-#define DRAM_CTRL_BLOCK_WRITE_PRECHARGE (1 << 9)
-#define DRAM_CTRL_ACTIVE_PRECHARGE      (1 << 8)
-#define DRAM_CTRL_RESET                 (1 << 7)
-#define DRAM_CTRL_REMAIN_ACTIVE         (1 << 6)
-#define DRAM_CTRL_BANKS                 (1 << 1)
-#define DRAM_CTRL_WRITE_PRECHARGE       (1 << 0)
-
-/* ----- Arvitration control register -------------------------- */
-#define ARBITRATION_CTRL                (0x000014 + VOYAGER_BASE)
-#define ARBITRATION_CTRL_CPUMEM         (1 << 29)
-#define ARBITRATION_CTRL_INTMEM         (1 << 28)
-#define ARBITRATION_CTRL_USB_OFF        (0 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_1 (1 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_2 (2 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_3 (3 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_4 (4 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_5 (5 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_6 (6 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_7 (7 << 24)
-#define ARBITRATION_CTRL_PANEL_OFF      (0 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_1       (1 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_2       (2 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_3       (3 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_4       (4 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_5       (5 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_6       (6 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_7       (7 << 20)
-#define ARBITRATION_CTRL_ZVPORT_OFF     (0 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_1     (1 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_2     (2 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_3     (3 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_4     (4 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_5     (5 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_6     (6 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_7     (7 << 16)
-#define ARBITRATION_CTRL_CMD_INTPR_OFF  (0 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_1   (1 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_2   (2 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_3   (3 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_4   (4 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_5   (5 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_6   (6 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_7   (7 << 12)
-#define ARBITRATION_CTRL_DMA_OFF        (0 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_1 (1 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_2 (2 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_3 (3 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_4 (4 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_5 (5 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_6 (6 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_7 (7 << 8)
-#define ARBITRATION_CTRL_VIDEO_OFF      (0 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_1       (1 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_2       (2 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_3       (3 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_4       (4 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_5       (5 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_6       (6 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_7       (7 << 4)
-#define ARBITRATION_CTRL_CRT_OFF        (0 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_1 (1 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_2 (2 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_3 (3 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_4 (4 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_5 (5 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_6 (6 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_7 (7 << 0)
-
-/* ----- Command list status register -------------------------- */
-#define CMD_INTPR_STATUS                (0x000024 + VOYAGER_BASE)
-
-/* ----- Interrupt status register ----------------------------- */
-#define INT_STATUS                      (0x00002c + VOYAGER_BASE)
-#define INT_STATUS_UH                   (1 << 6)
-#define INT_STATUS_MC                   (1 << 10)
-#define INT_STATUS_U0                   (1 << 12)
-#define INT_STATUS_U1                   (1 << 13)
-#define INT_STATUS_AC                   (1 << 17)
-
-/* ----- Interrupt mask register ------------------------------ */
-#define VOYAGER_INT_MASK                (0x000030 + VOYAGER_BASE)
-#define VOYAGER_INT_MASK_AC             (1 << 17)
-
-/* ----- Current Gate register ---------------------------------*/
-#define CURRENT_GATE                    (0x000038 + VOYAGER_BASE)
-
-/* ----- Power mode 0 gate register --------------------------- */
-#define POWER_MODE0_GATE                (0x000040 + VOYAGER_BASE)
-#define POWER_MODE0_GATE_G              (1 << 6)
-#define POWER_MODE0_GATE_U0             (1 << 7)
-#define POWER_MODE0_GATE_U1             (1 << 8)
-#define POWER_MODE0_GATE_UH             (1 << 11)
-#define POWER_MODE0_GATE_AC             (1 << 18)
-
-/* ----- Power mode 1 gate register --------------------------- */
-#define POWER_MODE1_GATE                (0x000048 + VOYAGER_BASE)
-#define POWER_MODE1_GATE_G              (1 << 6)
-#define POWER_MODE1_GATE_U0             (1 << 7)
-#define POWER_MODE1_GATE_U1             (1 << 8)
-#define POWER_MODE1_GATE_UH             (1 << 11)
-#define POWER_MODE1_GATE_AC             (1 << 18)
-
-/* ----- Power mode 0 clock register -------------------------- */
-#define POWER_MODE0_CLOCK               (0x000044 + VOYAGER_BASE)
-
-/* ----- Power mode 1 clock register -------------------------- */
-#define POWER_MODE1_CLOCK               (0x00004C + VOYAGER_BASE)
-
-/* ----- Power mode controll register ------------------------- */
-#define POWER_MODE_CTRL                 (0x000054 + VOYAGER_BASE)
-
-/* ----- Miscellaneous Timing register ------------------------ */
-#define SYSTEM_DRAM_CTRL                (0x000068 + VOYAGER_BASE)
-
-/* ----- PWM register ------------------------------------------*/
-#define PWM_0                           (0x010020 + VOYAGER_BASE)
-#define PWM_0_HC(x)                     (((x)&0x0fff)<<20)
-#define PWM_0_LC(x)                     (((x)&0x0fff)<<8 )
-#define PWM_0_CLK_DEV(x)                (((x)&0x000f)<<4 )
-#define PWM_0_EN                        (1<<0)
-
-/* ----- I2C register ----------------------------------------- */
-#define I2C_BYTECOUNT                   (0x010040 + VOYAGER_BASE)
-#define I2C_CONTROL                     (0x010041 + VOYAGER_BASE)
-#define I2C_STATUS                      (0x010042 + VOYAGER_BASE)
-#define I2C_RESET                       (0x010042 + VOYAGER_BASE)
-#define I2C_SADDRESS                    (0x010043 + VOYAGER_BASE)
-#define I2C_DATA                        (0x010044 + VOYAGER_BASE)
-
-/* ----- Controle register bits ----------------------------------------- */
-#define I2C_CONTROL_E                   (1 << 0)
-#define I2C_CONTROL_MODE                (1 << 1)
-#define I2C_CONTROL_STATUS              (1 << 2)
-#define I2C_CONTROL_INT                 (1 << 4)
-#define I2C_CONTROL_INTACK              (1 << 5)
-#define I2C_CONTROL_REPEAT              (1 << 6)
-
-/* ----- Status register bits ----------------------------------------- */
-#define I2C_STATUS_BUSY                 (1 << 0)
-#define I2C_STATUS_ACK                  (1 << 1)
-#define I2C_STATUS_ERROR                (1 << 2)
-#define I2C_STATUS_COMPLETE             (1 << 3)
-
-/* ----- Reset register  ---------------------------------------------- */
-#define I2C_RESET_ERROR                 (1 << 2)
-
-/* ----- transmission frequencies ------------------------------------- */
-#define I2C_SADDRESS_SELECT             (1 << 0)
-
-/* ----- Display Controll register ----------------------------------------- */
-#define PANEL_DISPLAY_CTRL              (0x080000 + VOYAGER_BASE)
-#define PANEL_DISPLAY_CTRL_BIAS         (1<<26)
-#define PANEL_PAN_CTRL                  (0x080004 + VOYAGER_BASE)
-#define PANEL_COLOR_KEY                 (0x080008 + VOYAGER_BASE)
-#define PANEL_FB_ADDRESS                (0x08000C + VOYAGER_BASE)
-#define PANEL_FB_WIDTH                  (0x080010 + VOYAGER_BASE)
-#define PANEL_WINDOW_WIDTH              (0x080014 + VOYAGER_BASE)
-#define PANEL_WINDOW_HEIGHT             (0x080018 + VOYAGER_BASE)
-#define PANEL_PLANE_TL                  (0x08001C + VOYAGER_BASE)
-#define PANEL_PLANE_BR                  (0x080020 + VOYAGER_BASE)
-#define PANEL_HORIZONTAL_TOTAL          (0x080024 + VOYAGER_BASE)
-#define PANEL_HORIZONTAL_SYNC           (0x080028 + VOYAGER_BASE)
-#define PANEL_VERTICAL_TOTAL            (0x08002C + VOYAGER_BASE)
-#define PANEL_VERTICAL_SYNC             (0x080030 + VOYAGER_BASE)
-#define PANEL_CURRENT_LINE              (0x080034 + VOYAGER_BASE)
-#define VIDEO_DISPLAY_CTRL              (0x080040 + VOYAGER_BASE)
-#define VIDEO_FB_0_ADDRESS              (0x080044 + VOYAGER_BASE)
-#define VIDEO_FB_WIDTH                  (0x080048 + VOYAGER_BASE)
-#define VIDEO_FB_0_LAST_ADDRESS         (0x08004C + VOYAGER_BASE)
-#define VIDEO_PLANE_TL                  (0x080050 + VOYAGER_BASE)
-#define VIDEO_PLANE_BR                  (0x080054 + VOYAGER_BASE)
-#define VIDEO_SCALE                     (0x080058 + VOYAGER_BASE)
-#define VIDEO_INITIAL_SCALE             (0x08005C + VOYAGER_BASE)
-#define VIDEO_YUV_CONSTANTS             (0x080060 + VOYAGER_BASE)
-#define VIDEO_FB_1_ADDRESS              (0x080064 + VOYAGER_BASE)
-#define VIDEO_FB_1_LAST_ADDRESS         (0x080068 + VOYAGER_BASE)
-#define VIDEO_ALPHA_DISPLAY_CTRL        (0x080080 + VOYAGER_BASE)
-#define VIDEO_ALPHA_FB_ADDRESS          (0x080084 + VOYAGER_BASE)
-#define VIDEO_ALPHA_FB_WIDTH            (0x080088 + VOYAGER_BASE)
-#define VIDEO_ALPHA_FB_LAST_ADDRESS     (0x08008C + VOYAGER_BASE)
-#define VIDEO_ALPHA_PLANE_TL            (0x080090 + VOYAGER_BASE)
-#define VIDEO_ALPHA_PLANE_BR            (0x080094 + VOYAGER_BASE)
-#define VIDEO_ALPHA_SCALE               (0x080098 + VOYAGER_BASE)
-#define VIDEO_ALPHA_INITIAL_SCALE       (0x08009C + VOYAGER_BASE)
-#define VIDEO_ALPHA_CHROMA_KEY          (0x0800A0 + VOYAGER_BASE)
-#define PANEL_HWC_ADDRESS               (0x0800F0 + VOYAGER_BASE)
-#define PANEL_HWC_LOCATION              (0x0800F4 + VOYAGER_BASE)
-#define PANEL_HWC_COLOR_12              (0x0800F8 + VOYAGER_BASE)
-#define PANEL_HWC_COLOR_3               (0x0800FC + VOYAGER_BASE)
-#define ALPHA_DISPLAY_CTRL              (0x080100 + VOYAGER_BASE)
-#define ALPHA_FB_ADDRESS                (0x080104 + VOYAGER_BASE)
-#define ALPHA_FB_WIDTH                  (0x080108 + VOYAGER_BASE)
-#define ALPHA_PLANE_TL                  (0x08010C + VOYAGER_BASE)
-#define ALPHA_PLANE_BR                  (0x080110 + VOYAGER_BASE)
-#define ALPHA_CHROMA_KEY                (0x080114 + VOYAGER_BASE)
-#define CRT_DISPLAY_CTRL                (0x080200 + VOYAGER_BASE)
-#define CRT_FB_ADDRESS                  (0x080204 + VOYAGER_BASE)
-#define CRT_FB_WIDTH                    (0x080208 + VOYAGER_BASE)
-#define CRT_HORIZONTAL_TOTAL            (0x08020C + VOYAGER_BASE)
-#define CRT_HORIZONTAL_SYNC             (0x080210 + VOYAGER_BASE)
-#define CRT_VERTICAL_TOTAL              (0x080214 + VOYAGER_BASE)
-#define CRT_VERTICAL_SYNC               (0x080218 + VOYAGER_BASE)
-#define CRT_SIGNATURE_ANALYZER          (0x08021C + VOYAGER_BASE)
-#define CRT_CURRENT_LINE                (0x080220 + VOYAGER_BASE)
-#define CRT_MONITOR_DETECT              (0x080224 + VOYAGER_BASE)
-#define CRT_HWC_ADDRESS                 (0x080230 + VOYAGER_BASE)
-#define CRT_HWC_LOCATION                (0x080234 + VOYAGER_BASE)
-#define CRT_HWC_COLOR_12                (0x080238 + VOYAGER_BASE)
-#define CRT_HWC_COLOR_3                 (0x08023C + VOYAGER_BASE)
-#define CRT_PALETTE_RAM                 (0x080400 + VOYAGER_BASE)
-#define PANEL_PALETTE_RAM               (0x080800 + VOYAGER_BASE)
-#define VIDEO_PALETTE_RAM               (0x080C00 + VOYAGER_BASE)
-
-/* ----- 8051 Controle register ----------------------------------------- */
-#define VOYAGER_8051_BASE               (0x000c0000 + VOYAGER_BASE)
-#define VOYAGER_8051_RESET              (0x000b0000 + VOYAGER_BASE)
-#define VOYAGER_8051_SELECT             (0x000b0004 + VOYAGER_BASE)
-#define VOYAGER_8051_CPU_INT            (0x000b000c + VOYAGER_BASE)
-
-/* ----- AC97 Controle register ----------------------------------------- */
-#define AC97_TX_SLOT0                   (0x00000000 + VOYAGER_AC97_BASE)
-#define AC97_CONTROL_STATUS             (0x00000080 + VOYAGER_AC97_BASE)
-#define AC97C_READ                      (1 << 19)
-#define AC97C_WD_BIT                    (1 << 2)
-#define AC97C_INDEX_MASK                0x7f
-
-/* arch/sh/cchips/voyagergx/consistent.c */
-void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
-int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t);
-
-/* arch/sh/cchips/voyagergx/irq.c */
-void setup_voyagergx_irq(void);
-
-#endif /* _VOYAGER_GX_REG_H */
diff --git a/include/asm-sh64/Kbuild b/include/asm-sh64/Kbuild
deleted file mode 100644
index c68e1680da01..000000000000
--- a/include/asm-sh64/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-include include/asm-generic/Kbuild.asm
diff --git a/include/asm-sh64/a.out.h b/include/asm-sh64/a.out.h
deleted file mode 100644
index 237ee4e5b72a..000000000000
--- a/include/asm-sh64/a.out.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef __ASM_SH64_A_OUT_H
-#define __ASM_SH64_A_OUT_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/a.out.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-struct exec
-{
-  unsigned long a_info;         /* Use macros N_MAGIC, etc for access */
-  unsigned a_text;              /* length of text, in bytes */
-  unsigned a_data;              /* length of data, in bytes */
-  unsigned a_bss;               /* length of uninitialized data area for file, in bytes */
-  unsigned a_syms;              /* length of symbol table data in file, in bytes */
-  unsigned a_entry;             /* start address */
-  unsigned a_trsize;            /* length of relocation info for text, in bytes */
-  unsigned a_drsize;            /* length of relocation info for data, in bytes */
-};
-
-#define N_TRSIZE(a)     ((a).a_trsize)
-#define N_DRSIZE(a)     ((a).a_drsize)
-#define N_SYMSIZE(a)    ((a).a_syms)
-
-#ifdef __KERNEL__
-
-#define STACK_TOP       TASK_SIZE
-#define STACK_TOP_MAX   STACK_TOP
-
-#endif
-
-#endif /* __ASM_SH64_A_OUT_H */
diff --git a/include/asm-sh64/atomic.h b/include/asm-sh64/atomic.h
deleted file mode 100644
index 28f2ea9b567b..000000000000
--- a/include/asm-sh64/atomic.h
+++ /dev/null
@@ -1,158 +0,0 @@
-#ifndef __ASM_SH64_ATOMIC_H
-#define __ASM_SH64_ATOMIC_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/atomic.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-/*
- * Atomic operations that C can't guarantee us.  Useful for
- * resource counting etc..
- *
- */
-
-typedef struct { volatile int counter; } atomic_t;
-
-#define ATOMIC_INIT(i)  ( (atomic_t) { (i) } )
-
-#define atomic_read(v)          ((v)->counter)
-#define atomic_set(v,i)         ((v)->counter = (i))
-
-#include <asm/system.h>
-
-/*
- * To get proper branch prediction for the main line, we must branch
- * forward to code at the end of this object's .text section, then
- * branch back to restart the operation.
- */
-
-static __inline__ void atomic_add(int i, atomic_t * v)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        *(long *)v += i;
-        local_irq_restore(flags);
-}
-
-static __inline__ void atomic_sub(int i, atomic_t *v)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        *(long *)v -= i;
-        local_irq_restore(flags);
-}
-
-static __inline__ int atomic_add_return(int i, atomic_t * v)
-{
-        unsigned long temp, flags;
-
-        local_irq_save(flags);
-        temp = *(long *)v;
-        temp += i;
-        *(long *)v = temp;
-        local_irq_restore(flags);
-
-        return temp;
-}
-
-#define atomic_add_negative(a, v)       (atomic_add_return((a), (v)) < 0)
-
-static __inline__ int atomic_sub_return(int i, atomic_t * v)
-{
-        unsigned long temp, flags;
-
-        local_irq_save(flags);
-        temp = *(long *)v;
-        temp -= i;
-        *(long *)v = temp;
-        local_irq_restore(flags);
-
-        return temp;
-}
-
-#define atomic_dec_return(v) atomic_sub_return(1,(v))
-#define atomic_inc_return(v) atomic_add_return(1,(v))
-
-/*
- * atomic_inc_and_test - increment and test
- * @v: pointer of type atomic_t
- *
- * Atomically increments @v by 1
- * and returns true if the result is zero, or false for all
- * other cases.
- */
-#define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
-
-#define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0)
-#define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0)
-
-#define atomic_inc(v) atomic_add(1,(v))
-#define atomic_dec(v) atomic_sub(1,(v))
-
-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
-{
-        int ret;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        ret = v->counter;
-        if (likely(ret == old))
-                v->counter = new;
-        local_irq_restore(flags);
-
-        return ret;
-}
-
-#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
-
-static inline int atomic_add_unless(atomic_t *v, int a, int u)
-{
-        int ret;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        ret = v->counter;
-        if (ret != u)
-                v->counter += a;
-        local_irq_restore(flags);
-
-        return ret != u;
-}
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-
-static __inline__ void atomic_clear_mask(unsigned int mask, atomic_t *v)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        *(long *)v &= ~mask;
-        local_irq_restore(flags);
-}
-
-static __inline__ void atomic_set_mask(unsigned int mask, atomic_t *v)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        *(long *)v |= mask;
-        local_irq_restore(flags);
-}
-
-/* Atomic operations are already serializing on SH */
-#define smp_mb__before_atomic_dec()     barrier()
-#define smp_mb__after_atomic_dec()      barrier()
-#define smp_mb__before_atomic_inc()     barrier()
-#define smp_mb__after_atomic_inc()      barrier()
-
-#include <asm-generic/atomic.h>
-#endif /* __ASM_SH64_ATOMIC_H */
diff --git a/include/asm-sh64/auxvec.h b/include/asm-sh64/auxvec.h
deleted file mode 100644
index 1ad5a44bdc76..000000000000
--- a/include/asm-sh64/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __ASM_SH64_AUXVEC_H
-#define __ASM_SH64_AUXVEC_H
-
-#endif /* __ASM_SH64_AUXVEC_H */
diff --git a/include/asm-sh64/bitops.h b/include/asm-sh64/bitops.h
deleted file mode 100644
index 600c59efb4c2..000000000000
--- a/include/asm-sh64/bitops.h
+++ /dev/null
@@ -1,155 +0,0 @@
-#ifndef __ASM_SH64_BITOPS_H
-#define __ASM_SH64_BITOPS_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/bitops.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- */
-
-#ifdef __KERNEL__
-
-#ifndef _LINUX_BITOPS_H
-#error only <linux/bitops.h> can be included directly
-#endif
-
-#include <linux/compiler.h>
-#include <asm/system.h>
-/* For __swab32 */
-#include <asm/byteorder.h>
-
-static __inline__ void set_bit(int nr, volatile void * addr)
-{
-        int     mask;
-        volatile unsigned int *a = addr;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        *a |= mask;
-        local_irq_restore(flags);
-}
-
-/*
- * clear_bit() doesn't provide any barrier for the compiler.
- */
-#define smp_mb__before_clear_bit()      barrier()
-#define smp_mb__after_clear_bit()       barrier()
-static inline void clear_bit(int nr, volatile unsigned long *a)
-{
-        int     mask;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        *a &= ~mask;
-        local_irq_restore(flags);
-}
-
-static __inline__ void change_bit(int nr, volatile void * addr)
-{
-        int     mask;
-        volatile unsigned int *a = addr;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        *a ^= mask;
-        local_irq_restore(flags);
-}
-
-static __inline__ int test_and_set_bit(int nr, volatile void * addr)
-{
-        int     mask, retval;
-        volatile unsigned int *a = addr;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        retval = (mask & *a) != 0;
-        *a |= mask;
-        local_irq_restore(flags);
-
-        return retval;
-}
-
-static __inline__ int test_and_clear_bit(int nr, volatile void * addr)
-{
-        int     mask, retval;
-        volatile unsigned int *a = addr;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        retval = (mask & *a) != 0;
-        *a &= ~mask;
-        local_irq_restore(flags);
-
-        return retval;
-}
-
-static __inline__ int test_and_change_bit(int nr, volatile void * addr)
-{
-        int     mask, retval;
-        volatile unsigned int *a = addr;
-        unsigned long flags;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        local_irq_save(flags);
-        retval = (mask & *a) != 0;
-        *a ^= mask;
-        local_irq_restore(flags);
-
-        return retval;
-}
-
-#include <asm-generic/bitops/non-atomic.h>
-
-static __inline__ unsigned long ffz(unsigned long word)
-{
-        unsigned long result, __d2, __d3;
-
-        __asm__("gettr  tr0, %2\n\t"
-                "pta    $+32, tr0\n\t"
-                "andi   %1, 1, %3\n\t"
-                "beq    %3, r63, tr0\n\t"
-                "pta    $+4, tr0\n"
-                "0:\n\t"
-                "shlri.l        %1, 1, %1\n\t"
-                "addi   %0, 1, %0\n\t"
-                "andi   %1, 1, %3\n\t"
-                "beqi   %3, 1, tr0\n"
-                "1:\n\t"
-                "ptabs  %2, tr0\n\t"
-                : "=r" (result), "=r" (word), "=r" (__d2), "=r" (__d3)
-                : "0" (0L), "1" (word));
-
-        return result;
-}
-
-#include <asm-generic/bitops/__ffs.h>
-#include <asm-generic/bitops/find.h>
-#include <asm-generic/bitops/hweight.h>
-#include <asm-generic/bitops/lock.h>
-#include <asm-generic/bitops/sched.h>
-#include <asm-generic/bitops/ffs.h>
-#include <asm-generic/bitops/ext2-non-atomic.h>
-#include <asm-generic/bitops/ext2-atomic.h>
-#include <asm-generic/bitops/minix.h>
-#include <asm-generic/bitops/fls.h>
-#include <asm-generic/bitops/fls64.h>
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_BITOPS_H */
diff --git a/include/asm-sh64/bug.h b/include/asm-sh64/bug.h
deleted file mode 100644
index f3a9c9248ef4..000000000000
--- a/include/asm-sh64/bug.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __ASM_SH64_BUG_H
-#define __ASM_SH64_BUG_H
-
-#ifdef CONFIG_BUG
-/*
- * Tell the user there is some problem, then force a segfault (in process
- * context) or a panic (interrupt context).
- */
-#define BUG() do { \
-        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-        *(volatile int *)0 = 0; \
-} while (0)
-
-#define HAVE_ARCH_BUG
-#endif
-
-#include <asm-generic/bug.h>
-
-#endif /* __ASM_SH64_BUG_H */
diff --git a/include/asm-sh64/bugs.h b/include/asm-sh64/bugs.h
deleted file mode 100644
index 05554aaea672..000000000000
--- a/include/asm-sh64/bugs.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef __ASM_SH64_BUGS_H
-#define __ASM_SH64_BUGS_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/bugs.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- *      void check_bugs(void);
- */
-
-/*
- * I don't know of any Super-H bugs yet.
- */
-
-#include <asm/processor.h>
-
-static void __init check_bugs(void)
-{
-        extern char *get_cpu_subtype(void);
-        extern unsigned long loops_per_jiffy;
-
-        cpu_data->loops_per_jiffy = loops_per_jiffy;
-
-        printk("CPU: %s\n", get_cpu_subtype());
-}
-#endif /* __ASM_SH64_BUGS_H */
diff --git a/include/asm-sh64/byteorder.h b/include/asm-sh64/byteorder.h
deleted file mode 100644
index 7419d78820ee..000000000000
--- a/include/asm-sh64/byteorder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef __ASM_SH64_BYTEORDER_H
-#define __ASM_SH64_BYTEORDER_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/byteorder.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <asm/types.h>
-
-static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
-{
-        __asm__("byterev        %0, %0\n\t"
-                "shari          %0, 32, %0"
-                : "=r" (x)
-                : "0" (x));
-        return x;
-}
-
-static inline __attribute_const__ __u16 ___arch__swab16(__u16 x)
-{
-        __asm__("byterev        %0, %0\n\t"
-                "shari          %0, 48, %0"
-                : "=r" (x)
-                : "0" (x));
-        return x;
-}
-
-#define __arch__swab32(x) ___arch__swab32(x)
-#define __arch__swab16(x) ___arch__swab16(x)
-
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
-#ifdef __LITTLE_ENDIAN__
-#include <linux/byteorder/little_endian.h>
-#else
-#include <linux/byteorder/big_endian.h>
-#endif
-
-#endif /* __ASM_SH64_BYTEORDER_H */
diff --git a/include/asm-sh64/cayman.h b/include/asm-sh64/cayman.h
deleted file mode 100644
index 7b6b96844842..000000000000
--- a/include/asm-sh64/cayman.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/cayman.h
- *
- * Cayman definitions
- *
- * Global defintions for the SH5 Cayman board
- *
- * Copyright (C) 2002 Stuart Menefy
- */
-
-
-/* Setup for the SMSC FDC37C935 / LAN91C100FD */
-#define SMSC_IRQ         IRQ_IRL1
-
-/* Setup for PCI Bus 2, which transmits interrupts via the EPLD */
-#define PCI2_IRQ         IRQ_IRL3
diff --git a/include/asm-sh64/cpumask.h b/include/asm-sh64/cpumask.h
deleted file mode 100644
index b7b105dbedaf..000000000000
--- a/include/asm-sh64/cpumask.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_CPUMASK_H
-#define __ASM_SH64_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* __ASM_SH64_CPUMASK_H */
diff --git a/include/asm-sh64/cputime.h b/include/asm-sh64/cputime.h
deleted file mode 100644
index 0fd89da2aa86..000000000000
--- a/include/asm-sh64/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __SH64_CPUTIME_H
-#define __SH64_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __SH64_CPUTIME_H */
diff --git a/include/asm-sh64/current.h b/include/asm-sh64/current.h
deleted file mode 100644
index 261224339d6f..000000000000
--- a/include/asm-sh64/current.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __ASM_SH64_CURRENT_H
-#define __ASM_SH64_CURRENT_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/current.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-#include <linux/thread_info.h>
-
-struct task_struct;
-
-static __inline__ struct task_struct * get_current(void)
-{
-        return current_thread_info()->task;
-}
-
-#define current get_current()
-
-#endif /* __ASM_SH64_CURRENT_H */
-
diff --git a/include/asm-sh64/delay.h b/include/asm-sh64/delay.h
deleted file mode 100644
index 6ae31301a16a..000000000000
--- a/include/asm-sh64/delay.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __ASM_SH64_DELAY_H
-#define __ASM_SH64_DELAY_H
-
-extern void __delay(int loops);
-extern void __udelay(unsigned long long usecs, unsigned long lpj);
-extern void __ndelay(unsigned long long nsecs, unsigned long lpj);
-extern void udelay(unsigned long usecs);
-extern void ndelay(unsigned long nsecs);
-
-#endif /* __ASM_SH64_DELAY_H */
-
diff --git a/include/asm-sh64/device.h b/include/asm-sh64/device.h
deleted file mode 100644
index d8f9872b0e2d..000000000000
--- a/include/asm-sh64/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/include/asm-sh64/div64.h b/include/asm-sh64/div64.h
deleted file mode 100644
index f75869565e2e..000000000000
--- a/include/asm-sh64/div64.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_DIV64_H
-#define __ASM_SH64_DIV64_H
-
-#include <asm-generic/div64.h>
-
-#endif /* __ASM_SH64_DIV64_H */
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h
deleted file mode 100644
index 18f8dd642ac5..000000000000
--- a/include/asm-sh64/dma-mapping.h
+++ /dev/null
@@ -1,194 +0,0 @@
-#ifndef __ASM_SH_DMA_MAPPING_H
-#define __ASM_SH_DMA_MAPPING_H
-
-#include <linux/mm.h>
-#include <linux/scatterlist.h>
-#include <asm/io.h>
-
-struct pci_dev;
-extern void *consistent_alloc(struct pci_dev *hwdev, size_t size,
-                                    dma_addr_t *dma_handle);
-extern void consistent_free(struct pci_dev *hwdev, size_t size,
-                                  void *vaddr, dma_addr_t dma_handle);
-
-#define dma_supported(dev, mask)        (1)
-
-static inline int dma_set_mask(struct device *dev, u64 mask)
-{
-        if (!dev->dma_mask || !dma_supported(dev, mask))
-                return -EIO;
-
-        *dev->dma_mask = mask;
-
-        return 0;
-}
-
-static inline void *dma_alloc_coherent(struct device *dev, size_t size,
-                         dma_addr_t *dma_handle, gfp_t flag)
-{
-        return consistent_alloc(NULL, size, dma_handle);
-}
-
-static inline void dma_free_coherent(struct device *dev, size_t size,
-                       void *vaddr, dma_addr_t dma_handle)
-{
-        consistent_free(NULL, size, vaddr, dma_handle);
-}
-
-#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
-#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
-#define dma_is_consistent(d, h) (1)
-
-static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
-                                  enum dma_data_direction dir)
-{
-        unsigned long start = (unsigned long) vaddr;
-        unsigned long s = start & L1_CACHE_ALIGN_MASK;
-        unsigned long e = (start + size) & L1_CACHE_ALIGN_MASK;
-
-        for (; s <= e; s += L1_CACHE_BYTES)
-                asm volatile ("ocbp     %0, 0" : : "r" (s));
-}
-
-static inline dma_addr_t dma_map_single(struct device *dev,
-                                        void *ptr, size_t size,
-                                        enum dma_data_direction dir)
-{
-#if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)
-        if (dev->bus == &pci_bus_type)
-                return virt_to_phys(ptr);
-#endif
-        dma_cache_sync(dev, ptr, size, dir);
-
-        return virt_to_phys(ptr);
-}
-
-#define dma_unmap_single(dev, addr, size, dir)  do { } while (0)
-
-static inline int dma_map_sg(struct device *dev, struct scatterlist *sg,
-                             int nents, enum dma_data_direction dir)
-{
-        int i;
-
-        for (i = 0; i < nents; i++) {
-#if !defined(CONFIG_PCI) || defined(CONFIG_SH_PCIDMA_NONCOHERENT)
-                dma_cache_sync(dev, sg_virt(&sg[i]), sg[i].length, dir);
-#endif
-                sg[i].dma_address = sg_phys(&sg[i]);
-        }
-
-        return nents;
-}
-
-#define dma_unmap_sg(dev, sg, nents, dir)       do { } while (0)
-
-static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
-                                      unsigned long offset, size_t size,
-                                      enum dma_data_direction dir)
-{
-        return dma_map_single(dev, page_address(page) + offset, size, dir);
-}
-
-static inline void dma_unmap_page(struct device *dev, dma_addr_t dma_address,
-                                  size_t size, enum dma_data_direction dir)
-{
-        dma_unmap_single(dev, dma_address, size, dir);
-}
-
-static inline void dma_sync_single(struct device *dev, dma_addr_t dma_handle,
-                                   size_t size, enum dma_data_direction dir)
-{
-#if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)
-        if (dev->bus == &pci_bus_type)
-                return;
-#endif
-        dma_cache_sync(dev, phys_to_virt(dma_handle), size, dir);
-}
-
-static inline void dma_sync_single_range(struct device *dev,
-                                         dma_addr_t dma_handle,
-                                         unsigned long offset, size_t size,
-                                         enum dma_data_direction dir)
-{
-#if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)
-        if (dev->bus == &pci_bus_type)
-                return;
-#endif
-        dma_cache_sync(dev, phys_to_virt(dma_handle) + offset, size, dir);
-}
-
-static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg,
-                               int nelems, enum dma_data_direction dir)
-{
-        int i;
-
-        for (i = 0; i < nelems; i++) {
-#if !defined(CONFIG_PCI) || defined(CONFIG_SH_PCIDMA_NONCOHERENT)
-                dma_cache_sync(dev, sg_virt(&sg[i]), sg[i].length, dir);
-#endif
-                sg[i].dma_address = sg_phys(&sg[i]);
-        }
-}
-
-static inline void dma_sync_single_for_cpu(struct device *dev,
-                                           dma_addr_t dma_handle, size_t size,
-                                           enum dma_data_direction dir)
-{
-        dma_sync_single(dev, dma_handle, size, dir);
-}
-
-static inline void dma_sync_single_for_device(struct device *dev,
-                                           dma_addr_t dma_handle, size_t size,
-                                           enum dma_data_direction dir)
-{
-        dma_sync_single(dev, dma_handle, size, dir);
-}
-
-static inline void dma_sync_single_range_for_cpu(struct device *dev,
-                                                 dma_addr_t dma_handle,
-                                                 unsigned long offset,
-                                                 size_t size,
-                                                 enum dma_data_direction direction)
-{
-        dma_sync_single_for_cpu(dev, dma_handle+offset, size, direction);
-}
-
-static inline void dma_sync_single_range_for_device(struct device *dev,
-                                                    dma_addr_t dma_handle,
-                                                    unsigned long offset,
-                                                    size_t size,
-                                                    enum dma_data_direction direction)
-{
-        dma_sync_single_for_device(dev, dma_handle+offset, size, direction);
-}
-
-static inline void dma_sync_sg_for_cpu(struct device *dev,
-                                       struct scatterlist *sg, int nelems,
-                                       enum dma_data_direction dir)
-{
-        dma_sync_sg(dev, sg, nelems, dir);
-}
-
-static inline void dma_sync_sg_for_device(struct device *dev,
-                                       struct scatterlist *sg, int nelems,
-                                       enum dma_data_direction dir)
-{
-        dma_sync_sg(dev, sg, nelems, dir);
-}
-
-static inline int dma_get_cache_alignment(void)
-{
-        /*
-         * Each processor family will define its own L1_CACHE_SHIFT,
-         * L1_CACHE_BYTES wraps to this, so this is always safe.
-         */
-        return L1_CACHE_BYTES;
-}
-
-static inline int dma_mapping_error(dma_addr_t dma_addr)
-{
-        return dma_addr == 0;
-}
-
-#endif /* __ASM_SH_DMA_MAPPING_H */
-
diff --git a/include/asm-sh64/dma.h b/include/asm-sh64/dma.h
deleted file mode 100644
index e701f39470a2..000000000000
--- a/include/asm-sh64/dma.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef __ASM_SH64_DMA_H
-#define __ASM_SH64_DMA_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/dma.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-#include <linux/mm.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-
-#define MAX_DMA_CHANNELS        4
-
-/*
- * SH5 can DMA in any memory area.
- *
- * The static definition is dodgy because it should limit
- * the highest DMA-able address based on the actual
- * Physical memory available. This is actually performed
- * at run time in defining the memory allowed to DMA_ZONE.
- */
-#define MAX_DMA_ADDRESS         ~(NPHYS_MASK)
-
-#define DMA_MODE_READ           0
-#define DMA_MODE_WRITE          1
-
-#ifdef CONFIG_PCI
-extern int isa_dma_bridge_buggy;
-#else
-#define isa_dma_bridge_buggy    (0)
-#endif
-
-#endif /* __ASM_SH64_DMA_H */
diff --git a/include/asm-sh64/elf.h b/include/asm-sh64/elf.h
deleted file mode 100644
index f994286e1998..000000000000
--- a/include/asm-sh64/elf.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef __ASM_SH64_ELF_H
-#define __ASM_SH64_ELF_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/elf.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * ELF register definitions..
- */
-
-#include <asm/ptrace.h>
-#include <asm/user.h>
-#include <asm/byteorder.h>
-
-typedef unsigned long elf_greg_t;
-
-#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-typedef struct user_fpu_struct elf_fpregset_t;
-
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) ( (x)->e_machine == EM_SH )
-
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_CLASS       ELFCLASS32
-#ifdef __LITTLE_ENDIAN__
-#define ELF_DATA        ELFDATA2LSB
-#else
-#define ELF_DATA        ELFDATA2MSB
-#endif
-#define ELF_ARCH        EM_SH
-
-#define USE_ELF_CORE_DUMP
-#define ELF_EXEC_PAGESIZE       4096
-
-/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
-   use of this is to invoke "./ld.so someprog" to test out a new version of
-   the loader.  We need to make sure that it is out of the way of the program
-   that it will "exec", and that there is sufficient room for the brk.  */
-
-#define ELF_ET_DYN_BASE         (2 * TASK_SIZE / 3)
-
-#define R_SH_DIR32              1
-#define R_SH_REL32              2
-#define R_SH_IMM_LOW16          246
-#define R_SH_IMM_LOW16_PCREL    247
-#define R_SH_IMM_MEDLOW16       248
-#define R_SH_IMM_MEDLOW16_PCREL 249
-
-#define ELF_CORE_COPY_REGS(_dest,_regs)                         \
-        memcpy((char *) &_dest, (char *) _regs,                 \
-               sizeof(struct pt_regs));
-
-/* This yields a mask that user programs can use to figure out what
-   instruction set this CPU supports.  This could be done in user space,
-   but it's not easy, and we've already done it here.  */
-
-#define ELF_HWCAP       (0)
-
-/* This yields a string that ld.so will use to load implementation
-   specific libraries for optimization.  This is more specific in
-   intent than poking at uname or /proc/cpuinfo.
-
-   For the moment, we have only optimizations for the Intel generations,
-   but that could change... */
-
-#define ELF_PLATFORM  (NULL)
-
-#define ELF_PLAT_INIT(_r, load_addr) \
-  do { _r->regs[0]=0; _r->regs[1]=0; _r->regs[2]=0; _r->regs[3]=0; \
-       _r->regs[4]=0; _r->regs[5]=0; _r->regs[6]=0; _r->regs[7]=0; \
-       _r->regs[8]=0; _r->regs[9]=0; _r->regs[10]=0; _r->regs[11]=0; \
-       _r->regs[12]=0; _r->regs[13]=0; _r->regs[14]=0; _r->regs[15]=0; \
-       _r->regs[16]=0; _r->regs[17]=0; _r->regs[18]=0; _r->regs[19]=0; \
-       _r->regs[20]=0; _r->regs[21]=0; _r->regs[22]=0; _r->regs[23]=0; \
-       _r->regs[24]=0; _r->regs[25]=0; _r->regs[26]=0; _r->regs[27]=0; \
-       _r->regs[28]=0; _r->regs[29]=0; _r->regs[30]=0; _r->regs[31]=0; \
-       _r->regs[32]=0; _r->regs[33]=0; _r->regs[34]=0; _r->regs[35]=0; \
-       _r->regs[36]=0; _r->regs[37]=0; _r->regs[38]=0; _r->regs[39]=0; \
-       _r->regs[40]=0; _r->regs[41]=0; _r->regs[42]=0; _r->regs[43]=0; \
-       _r->regs[44]=0; _r->regs[45]=0; _r->regs[46]=0; _r->regs[47]=0; \
-       _r->regs[48]=0; _r->regs[49]=0; _r->regs[50]=0; _r->regs[51]=0; \
-       _r->regs[52]=0; _r->regs[53]=0; _r->regs[54]=0; _r->regs[55]=0; \
-       _r->regs[56]=0; _r->regs[57]=0; _r->regs[58]=0; _r->regs[59]=0; \
-       _r->regs[60]=0; _r->regs[61]=0; _r->regs[62]=0; \
-       _r->tregs[0]=0; _r->tregs[1]=0; _r->tregs[2]=0; _r->tregs[3]=0; \
-       _r->tregs[4]=0; _r->tregs[5]=0; _r->tregs[6]=0; _r->tregs[7]=0; \
-       _r->sr = SR_FD | SR_MMU; } while (0)
-
-#ifdef __KERNEL__
-#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
-#endif
-
-#endif /* __ASM_SH64_ELF_H */
diff --git a/include/asm-sh64/emergency-restart.h b/include/asm-sh64/emergency-restart.h
deleted file mode 100644
index 108d8c48e42e..000000000000
--- a/include/asm-sh64/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/include/asm-sh64/errno.h b/include/asm-sh64/errno.h
deleted file mode 100644
index 57b46d4bdd41..000000000000
--- a/include/asm-sh64/errno.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_ERRNO_H
-#define __ASM_SH64_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif /* __ASM_SH64_ERRNO_H */
diff --git a/include/asm-sh64/fb.h b/include/asm-sh64/fb.h
deleted file mode 100644
index d92e99cd8c8a..000000000000
--- a/include/asm-sh64/fb.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-
-#include <linux/fb.h>
-#include <linux/fs.h>
-#include <asm/page.h>
-
-static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
-                                unsigned long off)
-{
-        vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
-}
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-        return 0;
-}
-
-#endif /* _ASM_FB_H_ */
diff --git a/include/asm-sh64/fcntl.h b/include/asm-sh64/fcntl.h
deleted file mode 100644
index 744dd79b9d5d..000000000000
--- a/include/asm-sh64/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sh/fcntl.h>
diff --git a/include/asm-sh64/futex.h b/include/asm-sh64/futex.h
deleted file mode 100644
index 6a332a9f099c..000000000000
--- a/include/asm-sh64/futex.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_FUTEX_H
-#define _ASM_FUTEX_H
-
-#include <asm-generic/futex.h>
-
-#endif
diff --git a/include/asm-sh64/gpio.h b/include/asm-sh64/gpio.h
deleted file mode 100644
index 6bc5a13d8415..000000000000
--- a/include/asm-sh64/gpio.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __ASM_SH64_GPIO_H
-#define __ASM_SH64_GPIO_H
-
-/*
- * This is just a stub, so that every arch using sh-sci has a gpio.h
- */
-
-#endif /* __ASM_SH64_GPIO_H */
diff --git a/include/asm-sh64/hardirq.h b/include/asm-sh64/hardirq.h
deleted file mode 100644
index 555fd7a35108..000000000000
--- a/include/asm-sh64/hardirq.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __ASM_SH64_HARDIRQ_H
-#define __ASM_SH64_HARDIRQ_H
-
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-/* entry.S is sensitive to the offsets of these fields */
-typedef struct {
-        unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>  /* Standard mappings for irq_cpustat_t above */
-
-/* arch/sh64/kernel/irq.c */
-extern void ack_bad_irq(unsigned int irq);
-
-#endif /* __ASM_SH64_HARDIRQ_H */
-
diff --git a/include/asm-sh64/hardware.h b/include/asm-sh64/hardware.h
deleted file mode 100644
index 931c1ad80847..000000000000
--- a/include/asm-sh64/hardware.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __ASM_SH64_HARDWARE_H
-#define __ASM_SH64_HARDWARE_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/hardware.h
- *
- * Copyright (C) 2002 Stuart Menefy
- * Copyright (C) 2003 Paul Mundt
- *
- * Defitions of the locations of registers in the physical address space.
- */
-
-#define PHYS_PERIPHERAL_BLOCK   0x09000000
-#define PHYS_DMAC_BLOCK         0x0e000000
-#define PHYS_PCI_BLOCK          0x60000000
-#define PHYS_EMI_BLOCK          0xff000000
-
-#endif /* __ASM_SH64_HARDWARE_H */
diff --git a/include/asm-sh64/hw_irq.h b/include/asm-sh64/hw_irq.h
deleted file mode 100644
index ebb39089b0ac..000000000000
--- a/include/asm-sh64/hw_irq.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __ASM_SH64_HW_IRQ_H
-#define __ASM_SH64_HW_IRQ_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/hw_irq.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#endif /* __ASM_SH64_HW_IRQ_H */
diff --git a/include/asm-sh64/ide.h b/include/asm-sh64/ide.h
deleted file mode 100644
index b6e31e8b9410..000000000000
--- a/include/asm-sh64/ide.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  linux/include/asm-sh64/ide.h
- *
- *  Copyright (C) 1994-1996  Linus Torvalds & authors
- *
- *  sh64 version by Richard Curnow & Paul Mundt
- */
-
-/*
- *  This file contains the sh64 architecture specific IDE code.
- */
-
-#ifndef __ASM_SH64_IDE_H
-#define __ASM_SH64_IDE_H
-
-#ifdef __KERNEL__
-
-
-/* Without this, the initialisation of PCI IDE cards end up calling
- * ide_init_hwif_ports, which won't work. */
-#ifdef CONFIG_BLK_DEV_IDEPCI
-#define ide_default_io_ctl(base)        (0)
-#endif
-
-#include <asm-generic/ide_iops.h>
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_IDE_H */
diff --git a/include/asm-sh64/io.h b/include/asm-sh64/io.h
deleted file mode 100644
index 7bd7314d38c2..000000000000
--- a/include/asm-sh64/io.h
+++ /dev/null
@@ -1,196 +0,0 @@
-#ifndef __ASM_SH64_IO_H
-#define __ASM_SH64_IO_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/io.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-/*
- * Convention:
- *    read{b,w,l}/write{b,w,l} are for PCI,
- *    while in{b,w,l}/out{b,w,l} are for ISA
- * These may (will) be platform specific function.
- *
- * In addition, we have
- *   ctrl_in{b,w,l}/ctrl_out{b,w,l} for SuperH specific I/O.
- * which are processor specific. Address should be the result of
- * onchip_remap();
- */
-
-#include <linux/compiler.h>
-#include <asm/cache.h>
-#include <asm/system.h>
-#include <asm/page.h>
-#include <asm-generic/iomap.h>
-
-/*
- * Nothing overly special here.. instead of doing the same thing
- * over and over again, we just define a set of sh64_in/out functions
- * with an implicit size. The traditional read{b,w,l}/write{b,w,l}
- * mess is wrapped to this, as are the SH-specific ctrl_in/out routines.
- */
-static inline unsigned char sh64_in8(const volatile void __iomem *addr)
-{
-        return *(volatile unsigned char __force *)addr;
-}
-
-static inline unsigned short sh64_in16(const volatile void __iomem *addr)
-{
-        return *(volatile unsigned short __force *)addr;
-}
-
-static inline unsigned int sh64_in32(const volatile void __iomem *addr)
-{
-        return *(volatile unsigned int __force *)addr;
-}
-
-static inline unsigned long long sh64_in64(const volatile void __iomem *addr)
-{
-        return *(volatile unsigned long long __force *)addr;
-}
-
-static inline void sh64_out8(unsigned char b, volatile void __iomem *addr)
-{
-        *(volatile unsigned char __force *)addr = b;
-        wmb();
-}
-
-static inline void sh64_out16(unsigned short b, volatile void __iomem *addr)
-{
-        *(volatile unsigned short __force *)addr = b;
-        wmb();
-}
-
-static inline void sh64_out32(unsigned int b, volatile void __iomem *addr)
-{
-        *(volatile unsigned int __force *)addr = b;
-        wmb();
-}
-
-static inline void sh64_out64(unsigned long long b, volatile void __iomem *addr)
-{
-        *(volatile unsigned long long __force *)addr = b;
-        wmb();
-}
-
-#define readb(addr)             sh64_in8(addr)
-#define readw(addr)             sh64_in16(addr)
-#define readl(addr)             sh64_in32(addr)
-#define readb_relaxed(addr)     sh64_in8(addr)
-#define readw_relaxed(addr)     sh64_in16(addr)
-#define readl_relaxed(addr)     sh64_in32(addr)
-
-#define writeb(b, addr)         sh64_out8(b, addr)
-#define writew(b, addr)         sh64_out16(b, addr)
-#define writel(b, addr)         sh64_out32(b, addr)
-
-#define ctrl_inb(addr)          sh64_in8(ioport_map(addr, 1))
-#define ctrl_inw(addr)          sh64_in16(ioport_map(addr, 2))
-#define ctrl_inl(addr)          sh64_in32(ioport_map(addr, 4))
-
-#define ctrl_outb(b, addr)      sh64_out8(b, ioport_map(addr, 1))
-#define ctrl_outw(b, addr)      sh64_out16(b, ioport_map(addr, 2))
-#define ctrl_outl(b, addr)      sh64_out32(b, ioport_map(addr, 4))
-
-#define ioread8(addr)           sh64_in8(addr)
-#define ioread16(addr)          sh64_in16(addr)
-#define ioread32(addr)          sh64_in32(addr)
-#define iowrite8(b, addr)       sh64_out8(b, addr)
-#define iowrite16(b, addr)      sh64_out16(b, addr)
-#define iowrite32(b, addr)      sh64_out32(b, addr)
-
-#define inb(addr)               ctrl_inb(addr)
-#define inw(addr)               ctrl_inw(addr)
-#define inl(addr)               ctrl_inl(addr)
-#define outb(b, addr)           ctrl_outb(b, addr)
-#define outw(b, addr)           ctrl_outw(b, addr)
-#define outl(b, addr)           ctrl_outl(b, addr)
-
-void outsw(unsigned long port, const void *addr, unsigned long count);
-void insw(unsigned long port, void *addr, unsigned long count);
-void outsl(unsigned long port, const void *addr, unsigned long count);
-void insl(unsigned long port, void *addr, unsigned long count);
-
-#define inb_p(addr)    inb(addr)
-#define inw_p(addr)    inw(addr)
-#define inl_p(addr)    inl(addr)
-#define outb_p(x,addr) outb(x,addr)
-#define outw_p(x,addr) outw(x,addr)
-#define outl_p(x,addr) outl(x,addr)
-
-#define __raw_readb             readb
-#define __raw_readw             readw
-#define __raw_readl             readl
-#define __raw_writeb            writeb
-#define __raw_writew            writew
-#define __raw_writel            writel
-
-void memcpy_toio(void __iomem *to, const void *from, long count);
-void memcpy_fromio(void *to, void __iomem *from, long count);
-
-#define mmiowb()
-
-#ifdef __KERNEL__
-
-#ifdef CONFIG_SH_CAYMAN
-extern unsigned long smsc_superio_virt;
-#endif
-#ifdef CONFIG_PCI
-extern unsigned long pciio_virt;
-#endif
-
-#define IO_SPACE_LIMIT 0xffffffff
-
-/*
- * Change virtual addresses to physical addresses and vv.
- * These are trivial on the 1:1 Linux/SuperH mapping
- */
-static inline unsigned long virt_to_phys(volatile void * address)
-{
-        return __pa(address);
-}
-
-static inline void * phys_to_virt(unsigned long address)
-{
-        return __va(address);
-}
-
-extern void * __ioremap(unsigned long phys_addr, unsigned long size,
-                        unsigned long flags);
-
-static inline void * ioremap(unsigned long phys_addr, unsigned long size)
-{
-        return __ioremap(phys_addr, size, 1);
-}
-
-static inline void * ioremap_nocache (unsigned long phys_addr, unsigned long size)
-{
-        return __ioremap(phys_addr, size, 0);
-}
-
-extern void iounmap(void *addr);
-
-unsigned long onchip_remap(unsigned long addr, unsigned long size, const char* name);
-extern void onchip_unmap(unsigned long vaddr);
-
-/*
- * Convert a physical pointer to a virtual kernel pointer for /dev/mem
- * access
- */
-#define xlate_dev_mem_ptr(p)    __va(p)
-
-/*
- * Convert a virtual cached pointer to an uncached pointer
- */
-#define xlate_dev_kmem_ptr(p)   p
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_SH64_IO_H */
diff --git a/include/asm-sh64/ioctl.h b/include/asm-sh64/ioctl.h
deleted file mode 100644
index b279fe06dfe5..000000000000
--- a/include/asm-sh64/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/include/asm-sh64/ioctls.h b/include/asm-sh64/ioctls.h
deleted file mode 100644
index 6b0c04f63c57..000000000000
--- a/include/asm-sh64/ioctls.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#ifndef __ASM_SH64_IOCTLS_H
-#define __ASM_SH64_IOCTLS_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/ioctls.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2004  Richard Curnow
- *
- */
-
-#include <asm/ioctl.h>
-
-#define FIOCLEX         0x6601          /* _IO('f', 1) */
-#define FIONCLEX        0x6602          /* _IO('f', 2) */
-#define FIOASYNC        0x4004667d      /* _IOW('f', 125, int) */
-#define FIONBIO         0x4004667e      /* _IOW('f', 126, int) */
-#define FIONREAD        0x8004667f      /* _IOW('f', 127, int) */
-#define TIOCINQ         FIONREAD
-#define FIOQSIZE        0x80086680      /* _IOR('f', 128, loff_t) */
-
-#define TCGETS          0x5401
-#define TCSETS          0x5402
-#define TCSETSW         0x5403
-#define TCSETSF         0x5404
-
-#define TCGETA          0x80127417      /* _IOR('t', 23, struct termio) */
-#define TCSETA          0x40127418      /* _IOW('t', 24, struct termio) */
-#define TCSETAW         0x40127419      /* _IOW('t', 25, struct termio) */
-#define TCSETAF         0x4012741c      /* _IOW('t', 28, struct termio) */
-
-#define TCSBRK          0x741d          /* _IO('t', 29) */
-#define TCXONC          0x741e          /* _IO('t', 30) */
-#define TCFLSH          0x741f          /* _IO('t', 31) */
-
-#define TIOCSWINSZ      0x40087467      /* _IOW('t', 103, struct winsize) */
-#define TIOCGWINSZ      0x80087468      /* _IOR('t', 104, struct winsize) */
-#define TIOCSTART       0x746e          /* _IO('t', 110)  start output, like ^Q */
-#define TIOCSTOP        0x746f          /* _IO('t', 111)  stop output, like ^S */
-#define TIOCOUTQ        0x80047473      /* _IOR('t', 115, int) output queue size */
-
-#define TIOCSPGRP       0x40047476      /* _IOW('t', 118, int) */
-#define TIOCGPGRP       0x80047477      /* _IOR('t', 119, int) */
-
-#define TIOCEXCL        0x540c          /* _IO('T', 12) */
-#define TIOCNXCL        0x540d          /* _IO('T', 13) */
-#define TIOCSCTTY       0x540e          /* _IO('T', 14) */
-
-#define TIOCSTI         0x40015412      /* _IOW('T', 18, char) 0x5412 */
-#define TIOCMGET        0x80045415      /* _IOR('T', 21, unsigned int) 0x5415 */
-#define TIOCMBIS        0x40045416      /* _IOW('T', 22, unsigned int) 0x5416 */
-#define TIOCMBIC        0x40045417      /* _IOW('T', 23, unsigned int) 0x5417 */
-#define TIOCMSET        0x40045418      /* _IOW('T', 24, unsigned int) 0x5418 */
-
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-
-#define TIOCGSOFTCAR    0x80045419      /* _IOR('T', 25, unsigned int) 0x5419 */
-#define TIOCSSOFTCAR    0x4004541a      /* _IOW('T', 26, unsigned int) 0x541A */
-#define TIOCLINUX       0x4004541c      /* _IOW('T', 28, char) 0x541C */
-#define TIOCCONS        0x541d          /* _IO('T', 29) */
-#define TIOCGSERIAL     0x803c541e      /* _IOR('T', 30, struct serial_struct) 0x541E */
-#define TIOCSSERIAL     0x403c541f      /* _IOW('T', 31, struct serial_struct) 0x541F */
-#define TIOCPKT         0x40045420      /* _IOW('T', 32, int) 0x5420 */
-
-#define TIOCPKT_DATA             0
-#define TIOCPKT_FLUSHREAD        1
-#define TIOCPKT_FLUSHWRITE       2
-#define TIOCPKT_STOP             4
-#define TIOCPKT_START            8
-#define TIOCPKT_NOSTOP          16
-#define TIOCPKT_DOSTOP          32
-
-
-#define TIOCNOTTY       0x5422          /* _IO('T', 34) */
-#define TIOCSETD        0x40045423      /* _IOW('T', 35, int) 0x5423 */
-#define TIOCGETD        0x80045424      /* _IOR('T', 36, int) 0x5424 */
-#define TCSBRKP         0x40045424      /* _IOW('T', 37, int) 0x5425 */ /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT  0x8c105426      /* _IOR('T', 38, struct tty_struct) 0x5426 */ /* For debugging only */
-#define TIOCSBRK        0x5427          /* _IO('T', 39) */ /* BSD compatibility */
-#define TIOCCBRK        0x5428          /* _IO('T', 40) */ /* BSD compatibility */
-#define TIOCGSID        0x80045429      /* _IOR('T', 41, pid_t) 0x5429 */ /* Return the session ID of FD */
-#define TIOCGPTN        0x80045430      /* _IOR('T',0x30, unsigned int) 0x5430 Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK      0x40045431      /* _IOW('T',0x31, int) Lock/unlock Pty */
-
-#define TIOCSERCONFIG   0x5453          /* _IO('T', 83) */
-#define TIOCSERGWILD    0x80045454      /* _IOR('T', 84,  int) 0x5454 */
-#define TIOCSERSWILD    0x40045455      /* _IOW('T', 85,  int) 0x5455 */
-#define TIOCGLCKTRMIOS  0x5456
-#define TIOCSLCKTRMIOS  0x5457
-#define TIOCSERGSTRUCT  0x80d85458      /* _IOR('T', 88, struct async_struct) 0x5458 */ /* For debugging only */
-#define TIOCSERGETLSR   0x80045459      /* _IOR('T', 89, unsigned int) 0x5459 */ /* Get line status register */
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-#define TIOCSER_TEMT    0x01    /* Transmitter physically empty */
-
-#define TIOCSERGETMULTI 0x80a8545a      /* _IOR('T', 90, struct serial_multiport_struct) 0x545A */ /* Get multiport config  */
-#define TIOCSERSETMULTI 0x40a8545b      /* _IOW('T', 91, struct serial_multiport_struct) 0x545B */ /* Set multiport config */
-
-#define TIOCMIWAIT      0x545c          /* _IO('T', 92) wait for a change on serial input line(s) */
-#define TIOCGICOUNT     0x545d          /* read serial port inline interrupt counts */
-
-#endif /* __ASM_SH64_IOCTLS_H */
diff --git a/include/asm-sh64/ipcbuf.h b/include/asm-sh64/ipcbuf.h
deleted file mode 100644
index c441e35299c0..000000000000
--- a/include/asm-sh64/ipcbuf.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef __ASM_SH64_IPCBUF_H__
-#define __ASM_SH64_IPCBUF_H__
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/ipcbuf.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * The ipc64_perm structure for i386 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 32-bit mode_t and seq
- * - 2 miscellaneous 32-bit values
- */
-
-struct ipc64_perm
-{
-        __kernel_key_t          key;
-        __kernel_uid32_t        uid;
-        __kernel_gid32_t        gid;
-        __kernel_uid32_t        cuid;
-        __kernel_gid32_t        cgid;
-        __kernel_mode_t         mode;
-        unsigned short          __pad1;
-        unsigned short          seq;
-        unsigned short          __pad2;
-        unsigned long           __unused1;
-        unsigned long           __unused2;
-};
-
-#endif /* __ASM_SH64_IPCBUF_H__ */
diff --git a/include/asm-sh64/irq_regs.h b/include/asm-sh64/irq_regs.h
deleted file mode 100644
index 3dd9c0b70270..000000000000
--- a/include/asm-sh64/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/include/asm-sh64/kdebug.h b/include/asm-sh64/kdebug.h
deleted file mode 100644
index 6ece1b037665..000000000000
--- a/include/asm-sh64/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/include/asm-sh64/keyboard.h b/include/asm-sh64/keyboard.h
deleted file mode 100644
index 0b01c3beb2f8..000000000000
--- a/include/asm-sh64/keyboard.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  linux/include/asm-shmedia/keyboard.h
- *
- * Copied from i386 version:
- *    Created 3 Nov 1996 by Geert Uytterhoeven
- */
-
-/*
- *  This file contains the i386 architecture specific keyboard definitions
- */
-
-#ifndef __ASM_SH64_KEYBOARD_H
-#define __ASM_SH64_KEYBOARD_H
-
-#ifdef __KERNEL__
-
-#include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <asm/io.h>
-
-#ifdef CONFIG_SH_CAYMAN
-#define KEYBOARD_IRQ                    (START_EXT_IRQS + 2) /* SMSC SuperIO IRQ 1 */
-#endif
-#define DISABLE_KBD_DURING_INTERRUPTS   0
-
-extern int pckbd_setkeycode(unsigned int scancode, unsigned int keycode);
-extern int pckbd_getkeycode(unsigned int scancode);
-extern int pckbd_translate(unsigned char scancode, unsigned char *keycode,
-                           char raw_mode);
-extern char pckbd_unexpected_up(unsigned char keycode);
-extern void pckbd_leds(unsigned char leds);
-extern void pckbd_init_hw(void);
-
-#define kbd_setkeycode          pckbd_setkeycode
-#define kbd_getkeycode          pckbd_getkeycode
-#define kbd_translate           pckbd_translate
-#define kbd_unexpected_up       pckbd_unexpected_up
-#define kbd_leds                pckbd_leds
-#define kbd_init_hw             pckbd_init_hw
-
-/* resource allocation */
-#define kbd_request_region()
-#define kbd_request_irq(handler) request_irq(KEYBOARD_IRQ, handler, 0, \
-                                             "keyboard", NULL)
-
-/* How to access the keyboard macros on this platform.  */
-#define kbd_read_input() inb(KBD_DATA_REG)
-#define kbd_read_status() inb(KBD_STATUS_REG)
-#define kbd_write_output(val) outb(val, KBD_DATA_REG)
-#define kbd_write_command(val) outb(val, KBD_CNTL_REG)
-
-/* Some stoneage hardware needs delays after some operations.  */
-#define kbd_pause() do { } while(0)
-
-/*
- * Machine specific bits for the PS/2 driver
- */
-
-#ifdef CONFIG_SH_CAYMAN
-#define AUX_IRQ (START_EXT_IRQS + 6) /* SMSC SuperIO IRQ12 */
-#endif
-
-#define aux_request_irq(hand, dev_id)                                   \
-        request_irq(AUX_IRQ, hand, IRQF_SHARED, "PS2 Mouse", dev_id)
-
-#define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_SH64_KEYBOARD_H */
-
diff --git a/include/asm-sh64/kmap_types.h b/include/asm-sh64/kmap_types.h
deleted file mode 100644
index 2ae7c7587919..000000000000
--- a/include/asm-sh64/kmap_types.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH64_KMAP_TYPES_H
-#define __ASM_SH64_KMAP_TYPES_H
-
-#include <asm-sh/kmap_types.h>
-
-#endif /* __ASM_SH64_KMAP_TYPES_H */
-
diff --git a/include/asm-sh64/linkage.h b/include/asm-sh64/linkage.h
deleted file mode 100644
index 1dd0e84a228d..000000000000
--- a/include/asm-sh64/linkage.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH64_LINKAGE_H
-#define __ASM_SH64_LINKAGE_H
-
-#include <asm-sh/linkage.h>
-
-#endif /* __ASM_SH64_LINKAGE_H */
-
diff --git a/include/asm-sh64/local.h b/include/asm-sh64/local.h
deleted file mode 100644
index d9bd95dd36e2..000000000000
--- a/include/asm-sh64/local.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH64_LOCAL_H
-#define __ASM_SH64_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif /* __ASM_SH64_LOCAL_H */
-
diff --git a/include/asm-sh64/mc146818rtc.h b/include/asm-sh64/mc146818rtc.h
deleted file mode 100644
index 6cd3aec68dbe..000000000000
--- a/include/asm-sh64/mc146818rtc.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * linux/include/asm-sh64/mc146818rtc.h
- *
-*/
-
-/* For now, an empty place-holder to get IDE to compile. */
-
diff --git a/include/asm-sh64/mman.h b/include/asm-sh64/mman.h
deleted file mode 100644
index a9be6d885c3e..000000000000
--- a/include/asm-sh64/mman.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_MMAN_H
-#define __ASM_SH64_MMAN_H
-
-#include <asm-sh/mman.h>
-
-#endif /* __ASM_SH64_MMAN_H */
diff --git a/include/asm-sh64/mmu.h b/include/asm-sh64/mmu.h
deleted file mode 100644
index ccd36d26615a..000000000000
--- a/include/asm-sh64/mmu.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __MMU_H
-#define __MMU_H
-
-/* Default "unsigned long" context */
-typedef unsigned long mm_context_t;
-
-#endif
diff --git a/include/asm-sh64/mmu_context.h b/include/asm-sh64/mmu_context.h
deleted file mode 100644
index 507bf72bb8e1..000000000000
--- a/include/asm-sh64/mmu_context.h
+++ /dev/null
@@ -1,208 +0,0 @@
-#ifndef __ASM_SH64_MMU_CONTEXT_H
-#define __ASM_SH64_MMU_CONTEXT_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/mmu_context.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- * ASID handling idea taken from MIPS implementation.
- *
- */
-
-#ifndef __ASSEMBLY__
-
-/*
- * Cache of MMU context last used.
- *
- * The MMU "context" consists of two things:
- *   (a) TLB cache version (or cycle, top 24 bits of mmu_context_cache)
- *   (b) ASID (Address Space IDentifier, bottom 8 bits of mmu_context_cache)
- */
-extern unsigned long mmu_context_cache;
-
-#include <asm/page.h>
-#include <asm-generic/mm_hooks.h>
-
-/* Current mm's pgd */
-extern pgd_t *mmu_pdtp_cache;
-
-#define SR_ASID_MASK            0xffffffffff00ffffULL
-#define SR_ASID_SHIFT           16
-
-#define MMU_CONTEXT_ASID_MASK           0x000000ff
-#define MMU_CONTEXT_VERSION_MASK        0xffffff00
-#define MMU_CONTEXT_FIRST_VERSION       0x00000100
-#define NO_CONTEXT                      0
-
-/* ASID is 8-bit value, so it can't be 0x100 */
-#define MMU_NO_ASID                     0x100
-
-
-/*
- * Virtual Page Number mask
- */
-#define MMU_VPN_MASK    0xfffff000
-
-static inline void
-get_new_mmu_context(struct mm_struct *mm)
-{
-        extern void flush_tlb_all(void);
-        extern void flush_cache_all(void);
-
-        unsigned long mc = ++mmu_context_cache;
-
-        if (!(mc & MMU_CONTEXT_ASID_MASK)) {
-                /* We exhaust ASID of this version.
-                   Flush all TLB and start new cycle. */
-                flush_tlb_all();
-                /* We have to flush all caches as ASIDs are
-                   used in cache */
-                flush_cache_all();
-                /* Fix version if needed.
-                   Note that we avoid version #0/asid #0 to distingush NO_CONTEXT. */
-                if (!mc)
-                        mmu_context_cache = mc = MMU_CONTEXT_FIRST_VERSION;
-        }
-        mm->context = mc;
-}
-
-/*
- * Get MMU context if needed.
- */
-static __inline__ void
-get_mmu_context(struct mm_struct *mm)
-{
-        if (mm) {
-                unsigned long mc = mmu_context_cache;
-                /* Check if we have old version of context.
-                   If it's old, we need to get new context with new version. */
-                if ((mm->context ^ mc) & MMU_CONTEXT_VERSION_MASK)
-                        get_new_mmu_context(mm);
-        }
-}
-
-/*
- * Initialize the context related info for a new mm_struct
- * instance.
- */
-static inline int init_new_context(struct task_struct *tsk,
-                                        struct mm_struct *mm)
-{
-        mm->context = NO_CONTEXT;
-
-        return 0;
-}
-
-/*
- * Destroy context related info for an mm_struct that is about
- * to be put to rest.
- */
-static inline void destroy_context(struct mm_struct *mm)
-{
-        extern void flush_tlb_mm(struct mm_struct *mm);
-
-        /* Well, at least free TLB entries */
-        flush_tlb_mm(mm);
-}
-
-#endif  /* __ASSEMBLY__ */
-
-/* Common defines */
-#define TLB_STEP        0x00000010
-#define TLB_PTEH        0x00000000
-#define TLB_PTEL        0x00000008
-
-/* PTEH defines */
-#define PTEH_ASID_SHIFT 2
-#define PTEH_VALID      0x0000000000000001
-#define PTEH_SHARED     0x0000000000000002
-#define PTEH_MATCH_ASID 0x00000000000003ff
-
-#ifndef __ASSEMBLY__
-/* This has to be a common function because the next location to fill
- * information is shared. */
-extern void __do_tlb_refill(unsigned long address, unsigned long long is_text_not_data, pte_t *pte);
-
-/* Profiling counter. */
-#ifdef CONFIG_SH64_PROC_TLB
-extern unsigned long long calls_to_do_fast_page_fault;
-#endif
-
-static inline unsigned long get_asid(void)
-{
-        unsigned long long sr;
-
-        asm volatile ("getcon   " __SR ", %0\n\t"
-                      : "=r" (sr));
-
-        sr = (sr >> SR_ASID_SHIFT) & MMU_CONTEXT_ASID_MASK;
-        return (unsigned long) sr;
-}
-
-/* Set ASID into SR */
-static inline void set_asid(unsigned long asid)
-{
-        unsigned long long sr, pc;
-
-        asm volatile ("getcon   " __SR ", %0" : "=r" (sr));
-
-        sr = (sr & SR_ASID_MASK) | (asid << SR_ASID_SHIFT);
-
-        /*
-         * It is possible that this function may be inlined and so to avoid
-         * the assembler reporting duplicate symbols we make use of the gas trick
-         * of generating symbols using numerics and forward reference.
-         */
-        asm volatile ("movi     1, %1\n\t"
-                      "shlli    %1, 28, %1\n\t"
-                      "or       %0, %1, %1\n\t"
-                      "putcon   %1, " __SR "\n\t"
-                      "putcon   %0, " __SSR "\n\t"
-                      "movi     1f, %1\n\t"
-                      "ori      %1, 1 , %1\n\t"
-                      "putcon   %1, " __SPC "\n\t"
-                      "rte\n"
-                      "1:\n\t"
-                      : "=r" (sr), "=r" (pc) : "0" (sr));
-}
-
-/*
- * After we have set current->mm to a new value, this activates
- * the context for the new mm so we see the new mappings.
- */
-static __inline__ void activate_context(struct mm_struct *mm)
-{
-        get_mmu_context(mm);
-        set_asid(mm->context & MMU_CONTEXT_ASID_MASK);
-}
-
-
-static __inline__ void switch_mm(struct mm_struct *prev,
-                                 struct mm_struct *next,
-                                 struct task_struct *tsk)
-{
-        if (prev != next) {
-                mmu_pdtp_cache = next->pgd;
-                activate_context(next);
-        }
-}
-
-#define deactivate_mm(tsk,mm)   do { } while (0)
-
-#define activate_mm(prev, next) \
-        switch_mm((prev),(next),NULL)
-
-static inline void
-enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
-{
-}
-
-#endif  /* __ASSEMBLY__ */
-
-#endif /* __ASM_SH64_MMU_CONTEXT_H */
diff --git a/include/asm-sh64/module.h b/include/asm-sh64/module.h
deleted file mode 100644
index c313650d3d93..000000000000
--- a/include/asm-sh64/module.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __ASM_SH64_MODULE_H
-#define __ASM_SH64_MODULE_H
-/*
- * This file contains the SH architecture specific module code.
- */
-
-struct mod_arch_specific {
-        /* empty */
-};
-
-#define Elf_Shdr                Elf32_Shdr
-#define Elf_Sym                 Elf32_Sym
-#define Elf_Ehdr                Elf32_Ehdr
-
-#define module_map(x)           vmalloc(x)
-#define module_unmap(x)         vfree(x)
-#define module_arch_init(x)     (0)
-#define arch_init_modules(x)    do { } while (0)
-
-#endif /* __ASM_SH64_MODULE_H */
diff --git a/include/asm-sh64/msgbuf.h b/include/asm-sh64/msgbuf.h
deleted file mode 100644
index cf0494ce0ba8..000000000000
--- a/include/asm-sh64/msgbuf.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef __ASM_SH64_MSGBUF_H
-#define __ASM_SH64_MSGBUF_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/msgbuf.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * The msqid64_ds structure for i386 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
-        struct ipc64_perm msg_perm;
-        __kernel_time_t msg_stime;      /* last msgsnd time */
-        unsigned long   __unused1;
-        __kernel_time_t msg_rtime;      /* last msgrcv time */
-        unsigned long   __unused2;
-        __kernel_time_t msg_ctime;      /* last change time */
-        unsigned long   __unused3;
-        unsigned long  msg_cbytes;      /* current number of bytes on queue */
-        unsigned long  msg_qnum;        /* number of messages in queue */
-        unsigned long  msg_qbytes;      /* max number of bytes on queue */
-        __kernel_pid_t msg_lspid;       /* pid of last msgsnd */
-        __kernel_pid_t msg_lrpid;       /* last receive pid */
-        unsigned long  __unused4;
-        unsigned long  __unused5;
-};
-
-#endif /* __ASM_SH64_MSGBUF_H */
diff --git a/include/asm-sh64/mutex.h b/include/asm-sh64/mutex.h
deleted file mode 100644
index 458c1f7fbc18..000000000000
--- a/include/asm-sh64/mutex.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Pull in the generic implementation for the mutex fastpath.
- *
- * TODO: implement optimized primitives instead, or leave the generic
- * implementation in place, or pick the atomic_xchg() based generic
- * implementation. (see asm-generic/mutex-xchg.h for details)
- */
-
-#include <asm-generic/mutex-dec.h>
diff --git a/include/asm-sh64/namei.h b/include/asm-sh64/namei.h
deleted file mode 100644
index 99d759a805ce..000000000000
--- a/include/asm-sh64/namei.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __ASM_SH64_NAMEI_H
-#define __ASM_SH64_NAMEI_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/namei.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * Included from linux/fs/namei.c
- *
- */
-
-/* This dummy routine maybe changed to something useful
- * for /usr/gnemul/ emulation stuff.
- * Look at asm-sparc/namei.h for details.
- */
-
-#define __emul_prefix() NULL
-
-#endif /* __ASM_SH64_NAMEI_H */
diff --git a/include/asm-sh64/page.h b/include/asm-sh64/page.h
deleted file mode 100644
index 472089aefc60..000000000000
--- a/include/asm-sh64/page.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef __ASM_SH64_PAGE_H
-#define __ASM_SH64_PAGE_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/page.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- *
- * benedict.gaster@superh.com 19th, 24th July 2002.
- *
- * Modified to take account of enabling for D-CACHE support.
- *
- */
-
-
-/* PAGE_SHIFT determines the page size */
-#define PAGE_SHIFT      12
-#ifdef __ASSEMBLY__
-#define PAGE_SIZE       4096
-#else
-#define PAGE_SIZE       (1UL << PAGE_SHIFT)
-#endif
-#define PAGE_MASK       (~(PAGE_SIZE-1))
-#define PTE_MASK        PAGE_MASK
-
-#if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
-#define HPAGE_SHIFT     16
-#elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
-#define HPAGE_SHIFT     20
-#elif defined(CONFIG_HUGETLB_PAGE_SIZE_512MB)
-#define HPAGE_SHIFT     29
-#endif
-
-#ifdef CONFIG_HUGETLB_PAGE
-#define HPAGE_SIZE              (1UL << HPAGE_SHIFT)
-#define HPAGE_MASK              (~(HPAGE_SIZE-1))
-#define HUGETLB_PAGE_ORDER      (HPAGE_SHIFT-PAGE_SHIFT)
-#define ARCH_HAS_SETCLEAR_HUGE_PTE
-#endif
-
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-extern struct page *mem_map;
-extern void sh64_page_clear(void *page);
-extern void sh64_page_copy(void *from, void *to);
-
-#define clear_page(page)               sh64_page_clear(page)
-#define copy_page(to,from)             sh64_page_copy(from, to)
-
-#if defined(CONFIG_DCACHE_DISABLED)
-
-#define clear_user_page(page, vaddr, pg)        clear_page(page)
-#define copy_user_page(to, from, vaddr, pg)     copy_page(to, from)
-
-#else
-
-extern void clear_user_page(void *to, unsigned long address, struct page *pg);
-extern void copy_user_page(void *to, void *from, unsigned long address, struct page *pg);
-
-#endif /* defined(CONFIG_DCACHE_DISABLED) */
-
-/*
- * These are used to make use of C type-checking..
- */
-typedef struct { unsigned long long pte; } pte_t;
-typedef struct { unsigned long pmd; } pmd_t;
-typedef struct { unsigned long pgd; } pgd_t;
-typedef struct { unsigned long pgprot; } pgprot_t;
-
-#define pte_val(x)      ((x).pte)
-#define pmd_val(x)      ((x).pmd)
-#define pgd_val(x)      ((x).pgd)
-#define pgprot_val(x)   ((x).pgprot)
-
-#define __pte(x) ((pte_t) { (x) } )
-#define __pmd(x) ((pmd_t) { (x) } )
-#define __pgd(x) ((pgd_t) { (x) } )
-#define __pgprot(x)     ((pgprot_t) { (x) } )
-
-#endif /* !__ASSEMBLY__ */
-
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)        (((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
-/*
- * Kconfig defined.
- */
-#define __MEMORY_START          (CONFIG_MEMORY_START)
-#define PAGE_OFFSET             (CONFIG_CACHED_MEMORY_OFFSET)
-
-#define __pa(x)                 ((unsigned long)(x)-PAGE_OFFSET)
-#define __va(x)                 ((void *)((unsigned long)(x)+PAGE_OFFSET))
-#define MAP_NR(addr)            ((__pa(addr)-__MEMORY_START) >> PAGE_SHIFT)
-#define VALID_PAGE(page)        ((page - mem_map) < max_mapnr)
-
-#define phys_to_page(phys)      (mem_map + (((phys) - __MEMORY_START) >> PAGE_SHIFT))
-#define page_to_phys(page)      (((page - mem_map) << PAGE_SHIFT) + __MEMORY_START)
-
-/* PFN start number, because of __MEMORY_START */
-#define PFN_START               (__MEMORY_START >> PAGE_SHIFT)
-#define ARCH_PFN_OFFSET         (PFN_START)
-#define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define pfn_valid(pfn)          (((pfn) - PFN_START) < max_mapnr)
-#define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
-
-#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
-                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_SH64_PAGE_H */
diff --git a/include/asm-sh64/param.h b/include/asm-sh64/param.h
deleted file mode 100644
index f409adb41540..000000000000
--- a/include/asm-sh64/param.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/param.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-#ifndef __ASM_SH64_PARAM_H
-#define __ASM_SH64_PARAM_H
-
-
-#ifdef __KERNEL__
-# ifdef CONFIG_SH_WDT
-#  define HZ            1000            /* Needed for high-res WOVF */
-# else
-#  define HZ            100
-# endif
-# define USER_HZ        100             /* User interfaces are in "ticks" */
-# define CLOCKS_PER_SEC (USER_HZ)       /* frequency at which times() counts */
-#endif
-
-#ifndef HZ
-#define HZ 100
-#endif
-
-#define EXEC_PAGESIZE   4096
-
-#ifndef NGROUPS
-#define NGROUPS         32
-#endif
-
-#ifndef NOGROUP
-#define NOGROUP         (-1)
-#endif
-
-#define MAXHOSTNAMELEN  64      /* max length of hostname */
-
-#endif /* __ASM_SH64_PARAM_H */
diff --git a/include/asm-sh64/pci.h b/include/asm-sh64/pci.h
deleted file mode 100644
index 18055dbbb4b5..000000000000
--- a/include/asm-sh64/pci.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef __ASM_SH64_PCI_H
-#define __ASM_SH64_PCI_H
-
-#ifdef __KERNEL__
-
-#include <linux/dma-mapping.h>
-
-/* Can be used to override the logic in pci_scan_bus for skipping
-   already-configured bus numbers - to be used for buggy BIOSes
-   or architectures with incomplete PCI setup by the loader */
-
-#define pcibios_assign_all_busses()     1
-
-/*
- * These are currently the correct values for the STM overdrive board
- * We need some way of setting this on a board specific way, it will
- * not be the same on other boards I think
- */
-#if defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
-#define PCIBIOS_MIN_IO          0x2000
-#define PCIBIOS_MIN_MEM         0x40000000
-#endif
-
-extern void pcibios_set_master(struct pci_dev *dev);
-
-/*
- * Set penalize isa irq function
- */
-static inline void pcibios_penalize_isa_irq(int irq, int active)
-{
-        /* We don't do dynamic PCI IRQ allocation */
-}
-
-/* Dynamic DMA mapping stuff.
- * SuperH has everything mapped statically like x86.
- */
-
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <asm/scatterlist.h>
-#include <linux/string.h>
-#include <asm/io.h>
-
-/* pci_unmap_{single,page} being a nop depends upon the
- * configuration.
- */
-#ifdef CONFIG_SH_PCIDMA_NONCOHERENT
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       \
-        dma_addr_t ADDR_NAME;
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)         \
-        __u32 LEN_NAME;
-#define pci_unmap_addr(PTR, ADDR_NAME)                  \
-        ((PTR)->ADDR_NAME)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)         \
-        (((PTR)->ADDR_NAME) = (VAL))
-#define pci_unmap_len(PTR, LEN_NAME)                    \
-        ((PTR)->LEN_NAME)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)           \
-        (((PTR)->LEN_NAME) = (VAL))
-#else
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
-#define pci_unmap_addr(PTR, ADDR_NAME)          (0)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0)
-#define pci_unmap_len(PTR, LEN_NAME)            (0)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)   do { } while (0)
-#endif
-
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
-                                        enum pci_dma_burst_strategy *strat,
-                                        unsigned long *strategy_parameter)
-{
-        *strat = PCI_DMA_BURST_INFINITY;
-        *strategy_parameter = ~0UL;
-}
-#endif
-
-/* Board-specific fixup routines. */
-extern void pcibios_fixup(void);
-extern void pcibios_fixup_irqs(void);
-
-#ifdef CONFIG_PCI_AUTO
-extern int pciauto_assign_resources(int busno, struct pci_channel *hose);
-#endif
-
-#endif /* __KERNEL__ */
-
-/* generic pci stuff */
-#include <asm-generic/pci.h>
-
-/* generic DMA-mapping stuff */
-#include <asm-generic/pci-dma-compat.h>
-
-#endif /* __ASM_SH64_PCI_H */
-
diff --git a/include/asm-sh64/percpu.h b/include/asm-sh64/percpu.h
deleted file mode 100644
index a01d16cd0e8c..000000000000
--- a/include/asm-sh64/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_PERCPU
-#define __ASM_SH64_PERCPU
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ASM_SH64_PERCPU */
diff --git a/include/asm-sh64/pgalloc.h b/include/asm-sh64/pgalloc.h
deleted file mode 100644
index 6eccab770a6d..000000000000
--- a/include/asm-sh64/pgalloc.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#ifndef __ASM_SH64_PGALLOC_H
-#define __ASM_SH64_PGALLOC_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/pgalloc.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- * Copyright (C) 2003, 2004  Richard Curnow
- *
- */
-
-#include <linux/mm.h>
-#include <linux/quicklist.h>
-#include <asm/page.h>
-
-static inline void pgd_init(unsigned long page)
-{
-        unsigned long *pgd = (unsigned long *)page;
-        extern pte_t empty_bad_pte_table[PTRS_PER_PTE];
-        int i;
-
-        for (i = 0; i < USER_PTRS_PER_PGD; i++)
-                pgd[i] = (unsigned long)empty_bad_pte_table;
-}
-
-/*
- * Allocate and free page tables. The xxx_kernel() versions are
- * used to allocate a kernel page table - this turns on ASN bits
- * if any.
- */
-
-static inline pgd_t *get_pgd_slow(void)
-{
-        unsigned int pgd_size = (USER_PTRS_PER_PGD * sizeof(pgd_t));
-        pgd_t *ret = kmalloc(pgd_size, GFP_KERNEL);
-        return ret;
-}
-
-static inline pgd_t *pgd_alloc(struct mm_struct *mm)
-{
-        return quicklist_alloc(0, GFP_KERNEL, NULL);
-}
-
-static inline void pgd_free(pgd_t *pgd)
-{
-        quicklist_free(0, NULL, pgd);
-}
-
-static inline struct page *pte_alloc_one(struct mm_struct *mm,
-                                         unsigned long address)
-{
-        void *pg = quicklist_alloc(0, GFP_KERNEL, NULL);
-        return pg ? virt_to_page(pg) : NULL;
-}
-
-static inline void pte_free_kernel(pte_t *pte)
-{
-        quicklist_free(0, NULL, pte);
-}
-
-static inline void pte_free(struct page *pte)
-{
-        quicklist_free_page(0, NULL, pte);
-}
-
-static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
-                                           unsigned long address)
-{
-        return quicklist_alloc(0, GFP_KERNEL, NULL);
-}
-
-#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
-
-/*
- * allocating and freeing a pmd is trivial: the 1-entry pmd is
- * inside the pgd, so has no extra memory associated with it.
- */
-
-#if defined(CONFIG_SH64_PGTABLE_2_LEVEL)
-
-#define pmd_alloc_one(mm, addr)         ({ BUG(); ((pmd_t *)2); })
-#define pmd_free(x)                     do { } while (0)
-#define pgd_populate(mm, pmd, pte)      BUG()
-#define __pte_free_tlb(tlb,pte)         tlb_remove_page((tlb),(pte))
-#define __pmd_free_tlb(tlb,pmd)         do { } while (0)
-
-#elif defined(CONFIG_SH64_PGTABLE_3_LEVEL)
-
-static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
-{
-        return quicklist_alloc(0, GFP_KERNEL, NULL);
-}
-
-static inline void pmd_free(pmd_t *pmd)
-{
-        quicklist_free(0, NULL, pmd);
-}
-
-#define pgd_populate(mm, pgd, pmd)      pgd_set(pgd, pmd)
-#define __pmd_free_tlb(tlb,pmd)         pmd_free(pmd)
-
-#else
-#error "No defined page table size"
-#endif
-
-#define pmd_populate_kernel(mm, pmd, pte) \
-        set_pmd(pmd, __pmd(_PAGE_TABLE + (unsigned long) (pte)))
-
-static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
-                                struct page *pte)
-{
-        set_pmd(pmd, __pmd(_PAGE_TABLE + (unsigned long) page_address (pte)));
-}
-
-static inline void check_pgt_cache(void)
-{
-        quicklist_trim(0, NULL, 25, 16);
-}
-
-#endif /* __ASM_SH64_PGALLOC_H */
diff --git a/include/asm-sh64/platform.h b/include/asm-sh64/platform.h
deleted file mode 100644
index bd0d9c405a80..000000000000
--- a/include/asm-sh64/platform.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef __ASM_SH64_PLATFORM_H
-#define __ASM_SH64_PLATFORM_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/platform.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * benedict.gaster@superh.com:   3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time.
- */
-
-#include <linux/ioport.h>
-#include <asm/irq.h>
-
-
-/*
- * Platform definition structure.
- */
-struct sh64_platform {
-        unsigned int readonly_rootfs;
-        unsigned int ramdisk_flags;
-        unsigned int initial_root_dev;
-        unsigned int loader_type;
-        unsigned int initrd_start;
-        unsigned int initrd_size;
-        unsigned int fpu_flags;
-        unsigned int io_res_count;
-        unsigned int kram_res_count;
-        unsigned int xram_res_count;
-        unsigned int rom_res_count;
-        struct resource *io_res_p;
-        struct resource *kram_res_p;
-        struct resource *xram_res_p;
-        struct resource *rom_res_p;
-};
-
-extern struct sh64_platform platform_parms;
-
-extern unsigned long long memory_start, memory_end;
-
-extern unsigned long long fpu_in_use;
-
-extern int platform_int_priority[NR_INTC_IRQS];
-
-#define FPU_FLAGS               (platform_parms.fpu_flags)
-#define STANDARD_IO_RESOURCES   (platform_parms.io_res_count)
-#define STANDARD_KRAM_RESOURCES (platform_parms.kram_res_count)
-#define STANDARD_XRAM_RESOURCES (platform_parms.xram_res_count)
-#define STANDARD_ROM_RESOURCES  (platform_parms.rom_res_count)
-
-/*
- * Kernel Memory description, Respectively:
- * code = last but one memory descriptor
- * data = last memory descriptor
- */
-#define code_resource (platform_parms.kram_res_p[STANDARD_KRAM_RESOURCES - 2])
-#define data_resource (platform_parms.kram_res_p[STANDARD_KRAM_RESOURCES - 1])
-
-#endif  /* __ASM_SH64_PLATFORM_H */
diff --git a/include/asm-sh64/poll.h b/include/asm-sh64/poll.h
deleted file mode 100644
index ca2950267c53..000000000000
--- a/include/asm-sh64/poll.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __ASM_SH64_POLL_H
-#define __ASM_SH64_POLL_H
-
-#include <asm-generic/poll.h>
-
-#undef POLLREMOVE
-
-#endif /* __ASM_SH64_POLL_H */
diff --git a/include/asm-sh64/ptrace.h b/include/asm-sh64/ptrace.h
deleted file mode 100644
index c424f80e3ae0..000000000000
--- a/include/asm-sh64/ptrace.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef __ASM_SH64_PTRACE_H
-#define __ASM_SH64_PTRACE_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/ptrace.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * This struct defines the way the registers are stored on the
- * kernel stack during a system call or other kernel entry.
- */
-struct pt_regs {
-        unsigned long long pc;
-        unsigned long long sr;
-        unsigned long long syscall_nr;
-        unsigned long long regs[63];
-        unsigned long long tregs[8];
-        unsigned long long pad[2];
-};
-
-#ifdef __KERNEL__
-#define user_mode(regs) (((regs)->sr & 0x40000000)==0)
-#define instruction_pointer(regs) ((regs)->pc)
-#define profile_pc(regs) ((unsigned long)instruction_pointer(regs))
-extern void show_regs(struct pt_regs *);
-#endif
-
-#endif /* __ASM_SH64_PTRACE_H */
diff --git a/include/asm-sh64/resource.h b/include/asm-sh64/resource.h
deleted file mode 100644
index 8ff93944ae66..000000000000
--- a/include/asm-sh64/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_RESOURCE_H
-#define __ASM_SH64_RESOURCE_H
-
-#include <asm-sh/resource.h>
-
-#endif /* __ASM_SH64_RESOURCE_H */
diff --git a/include/asm-sh64/scatterlist.h b/include/asm-sh64/scatterlist.h
deleted file mode 100644
index 7f729bbfce43..000000000000
--- a/include/asm-sh64/scatterlist.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/scatterlist.h
- *
- * Copyright (C) 2003  Paul Mundt
- *
- */
-#ifndef __ASM_SH64_SCATTERLIST_H
-#define __ASM_SH64_SCATTERLIST_H
-
-#include <asm/types.h>
-
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-    unsigned long sg_magic;
-#endif
-    unsigned long page_link;
-    unsigned int offset;/* for highmem, page offset */
-    dma_addr_t dma_address;
-    unsigned int length;
-};
-
-/* These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns, or alternatively stop on the first sg_dma_len(sg) which
- * is 0.
- */
-#define sg_dma_address(sg)      ((sg)->dma_address)
-#define sg_dma_len(sg)          ((sg)->length)
-
-#define ISA_DMA_THRESHOLD (0xffffffff)
-
-#endif /* !__ASM_SH64_SCATTERLIST_H */
diff --git a/include/asm-sh64/sci.h b/include/asm-sh64/sci.h
deleted file mode 100644
index 793c568b7820..000000000000
--- a/include/asm-sh64/sci.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sh/sci.h>
diff --git a/include/asm-sh64/sections.h b/include/asm-sh64/sections.h
deleted file mode 100644
index 897f36bcdf85..000000000000
--- a/include/asm-sh64/sections.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH64_SECTIONS_H
-#define __ASM_SH64_SECTIONS_H
-
-#include <asm-sh/sections.h>
-
-#endif /* __ASM_SH64_SECTIONS_H */
-
diff --git a/include/asm-sh64/segment.h b/include/asm-sh64/segment.h
deleted file mode 100644
index 92ac001fc483..000000000000
--- a/include/asm-sh64/segment.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SEGMENT_H
-#define _ASM_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif /* _ASM_SEGMENT_H */
diff --git a/include/asm-sh64/semaphore-helper.h b/include/asm-sh64/semaphore-helper.h
deleted file mode 100644
index fcfafe263e86..000000000000
--- a/include/asm-sh64/semaphore-helper.h
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef __ASM_SH64_SEMAPHORE_HELPER_H
-#define __ASM_SH64_SEMAPHORE_HELPER_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/semaphore-helper.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-#include <asm/errno.h>
-
-/*
- * SMP- and interrupt-safe semaphores helper functions.
- *
- * (C) Copyright 1996 Linus Torvalds
- * (C) Copyright 1999 Andrea Arcangeli
- */
-
-/*
- * These two _must_ execute atomically wrt each other.
- *
- * This is trivially done with load_locked/store_cond,
- * which we have.  Let the rest of the losers suck eggs.
- */
-static __inline__ void wake_one_more(struct semaphore * sem)
-{
-        atomic_inc((atomic_t *)&sem->sleepers);
-}
-
-static __inline__ int waking_non_zero(struct semaphore *sem)
-{
-        unsigned long flags;
-        int ret = 0;
-
-        spin_lock_irqsave(&semaphore_wake_lock, flags);
-        if (sem->sleepers > 0) {
-                sem->sleepers--;
-                ret = 1;
-        }
-        spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-        return ret;
-}
-
-/*
- * waking_non_zero_interruptible:
- *      1       got the lock
- *      0       go to sleep
- *      -EINTR  interrupted
- *
- * We must undo the sem->count down_interruptible() increment while we are
- * protected by the spinlock in order to make atomic this atomic_inc() with the
- * atomic_read() in wake_one_more(), otherwise we can race. -arca
- */
-static __inline__ int waking_non_zero_interruptible(struct semaphore *sem,
-                                                struct task_struct *tsk)
-{
-        unsigned long flags;
-        int ret = 0;
-
-        spin_lock_irqsave(&semaphore_wake_lock, flags);
-        if (sem->sleepers > 0) {
-                sem->sleepers--;
-                ret = 1;
-        } else if (signal_pending(tsk)) {
-                atomic_inc(&sem->count);
-                ret = -EINTR;
-        }
-        spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-        return ret;
-}
-
-/*
- * waking_non_zero_trylock:
- *      1       failed to lock
- *      0       got the lock
- *
- * We must undo the sem->count down_trylock() increment while we are
- * protected by the spinlock in order to make atomic this atomic_inc() with the
- * atomic_read() in wake_one_more(), otherwise we can race. -arca
- */
-static __inline__ int waking_non_zero_trylock(struct semaphore *sem)
-{
-        unsigned long flags;
-        int ret = 1;
-
-        spin_lock_irqsave(&semaphore_wake_lock, flags);
-        if (sem->sleepers <= 0)
-                atomic_inc(&sem->count);
-        else {
-                sem->sleepers--;
-                ret = 0;
-        }
-        spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-        return ret;
-}
-
-#endif /* __ASM_SH64_SEMAPHORE_HELPER_H */
diff --git a/include/asm-sh64/semaphore.h b/include/asm-sh64/semaphore.h
deleted file mode 100644
index f027cc14b55b..000000000000
--- a/include/asm-sh64/semaphore.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef __ASM_SH64_SEMAPHORE_H
-#define __ASM_SH64_SEMAPHORE_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/semaphore.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * SMP- and interrupt-safe semaphores.
- *
- * (C) Copyright 1996 Linus Torvalds
- *
- * SuperH verison by Niibe Yutaka
- *  (Currently no asm implementation but generic C code...)
- *
- */
-
-#include <linux/linkage.h>
-#include <linux/spinlock.h>
-#include <linux/wait.h>
-#include <linux/rwsem.h>
-
-#include <asm/system.h>
-#include <asm/atomic.h>
-
-struct semaphore {
-        atomic_t count;
-        int sleepers;
-        wait_queue_head_t wait;
-};
-
-#define __SEMAPHORE_INITIALIZER(name, n)                                \
-{                                                                       \
-        .count          = ATOMIC_INIT(n),                               \
-        .sleepers       = 0,                                            \
-        .wait           = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait)    \
-}
-
-#define __DECLARE_SEMAPHORE_GENERIC(name,count) \
-        struct semaphore name = __SEMAPHORE_INITIALIZER(name,count)
-
-#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1)
-
-static inline void sema_init (struct semaphore *sem, int val)
-{
-/*
- *      *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val);
- *
- * i'd rather use the more flexible initialization above, but sadly
- * GCC 2.7.2.3 emits a bogus warning. EGCS doesnt. Oh well.
- */
-        atomic_set(&sem->count, val);
-        sem->sleepers = 0;
-        init_waitqueue_head(&sem->wait);
-}
-
-static inline void init_MUTEX (struct semaphore *sem)
-{
-        sema_init(sem, 1);
-}
-
-static inline void init_MUTEX_LOCKED (struct semaphore *sem)
-{
-        sema_init(sem, 0);
-}
-
-#if 0
-asmlinkage void __down_failed(void /* special register calling convention */);
-asmlinkage int  __down_failed_interruptible(void  /* params in registers */);
-asmlinkage int  __down_failed_trylock(void  /* params in registers */);
-asmlinkage void __up_wakeup(void /* special register calling convention */);
-#endif
-
-asmlinkage void __down(struct semaphore * sem);
-asmlinkage int  __down_interruptible(struct semaphore * sem);
-asmlinkage int  __down_trylock(struct semaphore * sem);
-asmlinkage void __up(struct semaphore * sem);
-
-extern spinlock_t semaphore_wake_lock;
-
-static inline void down(struct semaphore * sem)
-{
-        if (atomic_dec_return(&sem->count) < 0)
-                __down(sem);
-}
-
-static inline int down_interruptible(struct semaphore * sem)
-{
-        int ret = 0;
-
-        if (atomic_dec_return(&sem->count) < 0)
-                ret = __down_interruptible(sem);
-        return ret;
-}
-
-static inline int down_trylock(struct semaphore * sem)
-{
-        int ret = 0;
-
-        if (atomic_dec_return(&sem->count) < 0)
-                ret = __down_trylock(sem);
-        return ret;
-}
-
-/*
- * Note! This is subtle. We jump to wake people up only if
- * the semaphore was negative (== somebody was waiting on it).
- */
-static inline void up(struct semaphore * sem)
-{
-        if (atomic_inc_return(&sem->count) <= 0)
-                __up(sem);
-}
-
-#endif /* __ASM_SH64_SEMAPHORE_H */
diff --git a/include/asm-sh64/sembuf.h b/include/asm-sh64/sembuf.h
deleted file mode 100644
index ec4d9f143577..000000000000
--- a/include/asm-sh64/sembuf.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __ASM_SH64_SEMBUF_H
-#define __ASM_SH64_SEMBUF_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/sembuf.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * The semid64_ds structure for i386 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct semid64_ds {
-        struct ipc64_perm sem_perm;             /* permissions .. see ipc.h */
-        __kernel_time_t sem_otime;              /* last semop time */
-        unsigned long   __unused1;
-        __kernel_time_t sem_ctime;              /* last change time */
-        unsigned long   __unused2;
-        unsigned long   sem_nsems;              /* no. of semaphores in array */
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-
-#endif /* __ASM_SH64_SEMBUF_H */
diff --git a/include/asm-sh64/serial.h b/include/asm-sh64/serial.h
deleted file mode 100644
index e8d7b3f2da57..000000000000
--- a/include/asm-sh64/serial.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * include/asm-sh64/serial.h
- *
- * Configuration details for 8250, 16450, 16550, etc. serial ports
- */
-
-#ifndef _ASM_SERIAL_H
-#define _ASM_SERIAL_H
-
-/*
- * This assumes you have a 1.8432 MHz clock for your UART.
- *
- * It'd be nice if someone built a serial card with a 24.576 MHz
- * clock, since the 16550A is capable of handling a top speed of 1.5
- * megabits/second; but this requires the faster clock.
- */
-#define BASE_BAUD ( 1843200 / 16 )
-
-#define RS_TABLE_SIZE  2
-
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-
-#define SERIAL_PORT_DFNS                        \
-        /* UART CLK   PORT IRQ     FLAGS        */                      \
-        { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },      /* ttyS0 */     \
-        { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }       /* ttyS1 */
-
-/* XXX: This should be moved ino irq.h */
-#define irq_cannonicalize(x) (x)
-
-#endif /* _ASM_SERIAL_H */
diff --git a/include/asm-sh64/setup.h b/include/asm-sh64/setup.h
deleted file mode 100644
index 5b07b14c2927..000000000000
--- a/include/asm-sh64/setup.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __ASM_SH64_SETUP_H
-#define __ASM_SH64_SETUP_H
-
-#define COMMAND_LINE_SIZE 256
-
-#ifdef __KERNEL__
-
-#define PARAM ((unsigned char *)empty_zero_page)
-#define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000))
-#define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004))
-#define ORIG_ROOT_DEV (*(unsigned long *) (PARAM+0x008))
-#define LOADER_TYPE (*(unsigned long *) (PARAM+0x00c))
-#define INITRD_START (*(unsigned long *) (PARAM+0x010))
-#define INITRD_SIZE (*(unsigned long *) (PARAM+0x014))
-
-#define COMMAND_LINE ((char *) (PARAM+256))
-#define COMMAND_LINE_SIZE 256
-
-#endif  /*  __KERNEL__  */
-
-#endif /* __ASM_SH64_SETUP_H */
-
diff --git a/include/asm-sh64/shmbuf.h b/include/asm-sh64/shmbuf.h
deleted file mode 100644
index 022f3494dd64..000000000000
--- a/include/asm-sh64/shmbuf.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef __ASM_SH64_SHMBUF_H
-#define __ASM_SH64_SHMBUF_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/shmbuf.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * The shmid64_ds structure for i386 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct shmid64_ds {
-        struct ipc64_perm       shm_perm;       /* operation perms */
-        size_t                  shm_segsz;      /* size of segment (bytes) */
-        __kernel_time_t         shm_atime;      /* last attach time */
-        unsigned long           __unused1;
-        __kernel_time_t         shm_dtime;      /* last detach time */
-        unsigned long           __unused2;
-        __kernel_time_t         shm_ctime;      /* last change time */
-        unsigned long           __unused3;
-        __kernel_pid_t          shm_cpid;       /* pid of creator */
-        __kernel_pid_t          shm_lpid;       /* pid of last operator */
-        unsigned long           shm_nattch;     /* no. of current attaches */
-        unsigned long           __unused4;
-        unsigned long           __unused5;
-};
-
-struct shminfo64 {
-        unsigned long   shmmax;
-        unsigned long   shmmin;
-        unsigned long   shmmni;
-        unsigned long   shmseg;
-        unsigned long   shmall;
-        unsigned long   __unused1;
-        unsigned long   __unused2;
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-
-#endif /* __ASM_SH64_SHMBUF_H */
diff --git a/include/asm-sh64/shmparam.h b/include/asm-sh64/shmparam.h
deleted file mode 100644
index 1bb820c833ee..000000000000
--- a/include/asm-sh64/shmparam.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __ASM_SH64_SHMPARAM_H
-#define __ASM_SH64_SHMPARAM_H
-
-/*
- * Set this to a sensible safe default, we'll work out the specifics for the
- * align mask from the cache descriptor at run-time.
- */
-#define SHMLBA  0x4000
-
-#define __ARCH_FORCE_SHMLBA
-
-#endif /* __ASM_SH64_SHMPARAM_H */
diff --git a/include/asm-sh64/sigcontext.h b/include/asm-sh64/sigcontext.h
deleted file mode 100644
index 6293509d8cc1..000000000000
--- a/include/asm-sh64/sigcontext.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __ASM_SH64_SIGCONTEXT_H
-#define __ASM_SH64_SIGCONTEXT_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/sigcontext.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-struct sigcontext {
-        unsigned long   oldmask;
-
-        /* CPU registers */
-        unsigned long long sc_regs[63];
-        unsigned long long sc_tregs[8];
-        unsigned long long sc_pc;
-        unsigned long long sc_sr;
-
-        /* FPU registers */
-        unsigned long long sc_fpregs[32];
-        unsigned int sc_fpscr;
-        unsigned int sc_fpvalid;
-};
-
-#endif /* __ASM_SH64_SIGCONTEXT_H */
diff --git a/include/asm-sh64/siginfo.h b/include/asm-sh64/siginfo.h
deleted file mode 100644
index 56ef1da534d7..000000000000
--- a/include/asm-sh64/siginfo.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_SIGINFO_H
-#define __ASM_SH64_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif /* __ASM_SH64_SIGINFO_H */
diff --git a/include/asm-sh64/signal.h b/include/asm-sh64/signal.h
deleted file mode 100644
index 244e134730d9..000000000000
--- a/include/asm-sh64/signal.h
+++ /dev/null
@@ -1,159 +0,0 @@
-#ifndef __ASM_SH64_SIGNAL_H
-#define __ASM_SH64_SIGNAL_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/signal.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <linux/types.h>
-
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-
-#define _NSIG           64
-#define _NSIG_BPW       32
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-
-typedef unsigned long old_sigset_t;             /* at least 32 bits */
-
-typedef struct {
-        unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-
-#define SIGHUP           1
-#define SIGINT           2
-#define SIGQUIT          3
-#define SIGILL           4
-#define SIGTRAP          5
-#define SIGABRT          6
-#define SIGIOT           6
-#define SIGBUS           7
-#define SIGFPE           8
-#define SIGKILL          9
-#define SIGUSR1         10
-#define SIGSEGV         11
-#define SIGUSR2         12
-#define SIGPIPE         13
-#define SIGALRM         14
-#define SIGTERM         15
-#define SIGSTKFLT       16
-#define SIGCHLD         17
-#define SIGCONT         18
-#define SIGSTOP         19
-#define SIGTSTP         20
-#define SIGTTIN         21
-#define SIGTTOU         22
-#define SIGURG          23
-#define SIGXCPU         24
-#define SIGXFSZ         25
-#define SIGVTALRM       26
-#define SIGPROF         27
-#define SIGWINCH        28
-#define SIGIO           29
-#define SIGPOLL         SIGIO
-/*
-#define SIGLOST         29
-*/
-#define SIGPWR          30
-#define SIGSYS          31
-#define SIGUNUSED       31
-
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#define SIGRTMAX        (_NSIG-1)
-
-/*
- * SA_FLAGS values:
- *
- * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
- * SA_RESETHAND clears the handler when the signal is delivered.
- * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
- * SA_NODEFER prevents the current signal from being masked in the handler.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP    0x00000001
-#define SA_NOCLDWAIT    0x00000002 /* not supported yet */
-#define SA_SIGINFO      0x00000004
-#define SA_ONSTACK      0x08000000
-#define SA_RESTART      0x10000000
-#define SA_NODEFER      0x40000000
-#define SA_RESETHAND    0x80000000
-
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-
-#define SA_RESTORER     0x04000000
-
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        THREAD_SIZE
-
-#include <asm-generic/signal.h>
-
-#ifdef __KERNEL__
-struct old_sigaction {
-        __sighandler_t sa_handler;
-        old_sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-
-struct sigaction {
-        __sighandler_t sa_handler;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-        sigset_t sa_mask;               /* mask last for extensibility */
-};
-
-struct k_sigaction {
-        struct sigaction sa;
-};
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-struct sigaction {
-        union {
-          __sighandler_t _sa_handler;
-          void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-
-#endif /* __KERNEL__ */
-
-typedef struct sigaltstack {
-        void *ss_sp;
-        int ss_flags;
-        size_t ss_size;
-} stack_t;
-
-#ifdef __KERNEL__
-#include <asm/sigcontext.h>
-
-#define sigmask(sig)    (1UL << ((sig) - 1))
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_SIGNAL_H */
diff --git a/include/asm-sh64/smp.h b/include/asm-sh64/smp.h
deleted file mode 100644
index 4a4d0da39a84..000000000000
--- a/include/asm-sh64/smp.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __ASM_SH64_SMP_H
-#define __ASM_SH64_SMP_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/smp.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#endif /* __ASM_SH64_SMP_H */
diff --git a/include/asm-sh64/socket.h b/include/asm-sh64/socket.h
deleted file mode 100644
index 1853f7246ab0..000000000000
--- a/include/asm-sh64/socket.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_SOCKET_H
-#define __ASM_SH64_SOCKET_H
-
-#include <asm-sh/socket.h>
-
-#endif /* __ASM_SH64_SOCKET_H */
diff --git a/include/asm-sh64/sockios.h b/include/asm-sh64/sockios.h
deleted file mode 100644
index 419e76f12f41..000000000000
--- a/include/asm-sh64/sockios.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __ASM_SH64_SOCKIOS_H
-#define __ASM_SH64_SOCKIOS_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/sockios.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/* Socket-level I/O control calls. */
-#define FIOGETOWN       _IOR('f', 123, int)
-#define FIOSETOWN       _IOW('f', 124, int)
-
-#define SIOCATMARK      _IOR('s', 7, int)
-#define SIOCSPGRP       _IOW('s', 8, pid_t)
-#define SIOCGPGRP       _IOR('s', 9, pid_t)
-
-#define SIOCGSTAMP      _IOR('s', 100, struct timeval) /* Get stamp (timeval) */
-#define SIOCGSTAMPNS    _IOR('s', 101, struct timespec) /* Get stamp (timespec) */
-#endif /* __ASM_SH64_SOCKIOS_H */
diff --git a/include/asm-sh64/spinlock.h b/include/asm-sh64/spinlock.h
deleted file mode 100644
index 296b0c9b24a2..000000000000
--- a/include/asm-sh64/spinlock.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __ASM_SH64_SPINLOCK_H
-#define __ASM_SH64_SPINLOCK_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/spinlock.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#error "No SMP on SH64"
-
-#endif /* __ASM_SH64_SPINLOCK_H */
diff --git a/include/asm-sh64/stat.h b/include/asm-sh64/stat.h
deleted file mode 100644
index 86f551b1987e..000000000000
--- a/include/asm-sh64/stat.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef __ASM_SH64_STAT_H
-#define __ASM_SH64_STAT_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/stat.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-struct __old_kernel_stat {
-        unsigned short st_dev;
-        unsigned short st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned short st_rdev;
-        unsigned long  st_size;
-        unsigned long  st_atime;
-        unsigned long  st_mtime;
-        unsigned long  st_ctime;
-};
-
-struct stat {
-        unsigned short st_dev;
-        unsigned short __pad1;
-        unsigned long st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned short st_rdev;
-        unsigned short __pad2;
-        unsigned long  st_size;
-        unsigned long  st_blksize;
-        unsigned long  st_blocks;
-        unsigned long  st_atime;
-        unsigned long  st_atime_nsec;
-        unsigned long  st_mtime;
-        unsigned long  st_mtime_nsec;
-        unsigned long  st_ctime;
-        unsigned long  st_ctime_nsec;
-        unsigned long  __unused4;
-        unsigned long  __unused5;
-};
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat64 {
-        unsigned short  st_dev;
-        unsigned char   __pad0[10];
-
-        unsigned long   st_ino;
-        unsigned int    st_mode;
-        unsigned int    st_nlink;
-
-        unsigned long   st_uid;
-        unsigned long   st_gid;
-
-        unsigned short  st_rdev;
-        unsigned char   __pad3[10];
-
-        long long       st_size;
-        unsigned long   st_blksize;
-
-        unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-        unsigned long   __pad4;         /* future possible st_blocks high bits */
-
-        unsigned long   st_atime;
-        unsigned long   st_atime_nsec;
-
-        unsigned long   st_mtime;
-        unsigned long   st_mtime_nsec;
-
-        unsigned long   st_ctime;
-        unsigned long   st_ctime_nsec;  /* will be high 32 bits of ctime someday */
-
-        unsigned long   __unused1;
-        unsigned long   __unused2;
-};
-
-#endif /* __ASM_SH64_STAT_H */
diff --git a/include/asm-sh64/statfs.h b/include/asm-sh64/statfs.h
deleted file mode 100644
index 083fd79b2417..000000000000
--- a/include/asm-sh64/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_STATFS_H
-#define __ASM_SH64_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif /* __ASM_SH64_STATFS_H */
diff --git a/include/asm-sh64/system.h b/include/asm-sh64/system.h
deleted file mode 100644
index be2a15ffcc55..000000000000
--- a/include/asm-sh64/system.h
+++ /dev/null
@@ -1,190 +0,0 @@
-#ifndef __ASM_SH64_SYSTEM_H
-#define __ASM_SH64_SYSTEM_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/system.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- * Copyright (C) 2004  Richard Curnow
- *
- */
-
-#include <asm/registers.h>
-#include <asm/processor.h>
-
-/*
- *      switch_to() should switch tasks to task nr n, first
- */
-
-typedef struct {
-        unsigned long seg;
-} mm_segment_t;
-
-extern struct task_struct *sh64_switch_to(struct task_struct *prev,
-                                          struct thread_struct *prev_thread,
-                                          struct task_struct *next,
-                                          struct thread_struct *next_thread);
-
-#define switch_to(prev,next,last) \
-        do {\
-                if (last_task_used_math != next) {\
-                        struct pt_regs *regs = next->thread.uregs;\
-                        if (regs) regs->sr |= SR_FD;\
-                }\
-                last = sh64_switch_to(prev, &prev->thread, next, &next->thread);\
-        } while(0)
-
-#define nop() __asm__ __volatile__ ("nop")
-
-#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-
-extern void __xchg_called_with_bad_pointer(void);
-
-#define mb()    __asm__ __volatile__ ("synco": : :"memory")
-#define rmb()   mb()
-#define wmb()   __asm__ __volatile__ ("synco": : :"memory")
-#define read_barrier_depends()  do { } while (0)
-
-#ifdef CONFIG_SMP
-#define smp_mb()        mb()
-#define smp_rmb()       rmb()
-#define smp_wmb()       wmb()
-#define smp_read_barrier_depends()      read_barrier_depends()
-#else
-#define smp_mb()        barrier()
-#define smp_rmb()       barrier()
-#define smp_wmb()       barrier()
-#define smp_read_barrier_depends()      do { } while (0)
-#endif /* CONFIG_SMP */
-
-#define set_mb(var, value) do { (void)xchg(&var, value); } while (0)
-
-/* Interrupt Control */
-#ifndef HARD_CLI
-#define SR_MASK_L 0x000000f0L
-#define SR_MASK_LL 0x00000000000000f0LL
-#else
-#define SR_MASK_L 0x10000000L
-#define SR_MASK_LL 0x0000000010000000LL
-#endif
-
-static __inline__ void local_irq_enable(void)
-{
-        /* cli/sti based on SR.BL */
-        unsigned long long __dummy0, __dummy1=~SR_MASK_LL;
-
-        __asm__ __volatile__("getcon    " __SR ", %0\n\t"
-                             "and       %0, %1, %0\n\t"
-                             "putcon    %0, " __SR "\n\t"
-                             : "=&r" (__dummy0)
-                             : "r" (__dummy1));
-}
-
-static __inline__ void local_irq_disable(void)
-{
-        /* cli/sti based on SR.BL */
-        unsigned long long __dummy0, __dummy1=SR_MASK_LL;
-        __asm__ __volatile__("getcon    " __SR ", %0\n\t"
-                             "or        %0, %1, %0\n\t"
-                             "putcon    %0, " __SR "\n\t"
-                             : "=&r" (__dummy0)
-                             : "r" (__dummy1));
-}
-
-#define local_save_flags(x)                                             \
-(__extension__ ({       unsigned long long __dummy=SR_MASK_LL;          \
-        __asm__ __volatile__(                                           \
-                "getcon " __SR ", %0\n\t"                               \
-                "and    %0, %1, %0"                                     \
-                : "=&r" (x)                                             \
-                : "r" (__dummy));}))
-
-#define local_irq_save(x)                                               \
-(__extension__ ({       unsigned long long __d2=SR_MASK_LL, __d1;       \
-        __asm__ __volatile__(                                           \
-                "getcon " __SR ", %1\n\t"                               \
-                "or     %1, r63, %0\n\t"                                \
-                "or     %1, %2, %1\n\t"                                 \
-                "putcon %1, " __SR "\n\t"                               \
-                "and    %0, %2, %0"                                     \
-                : "=&r" (x), "=&r" (__d1)                               \
-                : "r" (__d2));}));
-
-#define local_irq_restore(x) do {                                       \
-        if ( ((x) & SR_MASK_L) == 0 )           /* dropping to 0 ? */   \
-                local_irq_enable();             /* yes...re-enable */   \
-} while (0)
-
-#define irqs_disabled()                 \
-({                                      \
-        unsigned long flags;            \
-        local_save_flags(flags);        \
-        (flags != 0);                   \
-})
-
-static inline unsigned long xchg_u32(volatile int * m, unsigned long val)
-{
-        unsigned long flags, retval;
-
-        local_irq_save(flags);
-        retval = *m;
-        *m = val;
-        local_irq_restore(flags);
-        return retval;
-}
-
-static inline unsigned long xchg_u8(volatile unsigned char * m, unsigned long val)
-{
-        unsigned long flags, retval;
-
-        local_irq_save(flags);
-        retval = *m;
-        *m = val & 0xff;
-        local_irq_restore(flags);
-        return retval;
-}
-
-static __inline__ unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-{
-        switch (size) {
-        case 4:
-                return xchg_u32(ptr, x);
-                break;
-        case 1:
-                return xchg_u8(ptr, x);
-                break;
-        }
-        __xchg_called_with_bad_pointer();
-        return x;
-}
-
-/* XXX
- * disable hlt during certain critical i/o operations
- */
-#define HAVE_DISABLE_HLT
-void disable_hlt(void);
-void enable_hlt(void);
-
-
-#define smp_mb()        barrier()
-#define smp_rmb()       barrier()
-#define smp_wmb()       barrier()
-
-#ifdef CONFIG_SH_ALPHANUMERIC
-/* This is only used for debugging. */
-extern void print_seg(char *file,int line);
-#define PLS() print_seg(__FILE__,__LINE__)
-#else   /* CONFIG_SH_ALPHANUMERIC */
-#define PLS()
-#endif  /* CONFIG_SH_ALPHANUMERIC */
-
-#define PL() printk("@ <%s,%s:%d>\n",__FILE__,__FUNCTION__,__LINE__)
-
-#define arch_align_stack(x) (x)
-
-#endif /* __ASM_SH64_SYSTEM_H */
diff --git a/include/asm-sh64/termbits.h b/include/asm-sh64/termbits.h
deleted file mode 100644
index 86bde5ec1414..000000000000
--- a/include/asm-sh64/termbits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_TERMBITS_H
-#define __ASM_SH64_TERMBITS_H
-
-#include <asm-sh/termbits.h>
-
-#endif /* __ASM_SH64_TERMBITS_H */
diff --git a/include/asm-sh64/termios.h b/include/asm-sh64/termios.h
deleted file mode 100644
index dc44e6ed3a7c..000000000000
--- a/include/asm-sh64/termios.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#ifndef __ASM_SH64_TERMIOS_H
-#define __ASM_SH64_TERMIOS_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/termios.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <asm/termbits.h>
-#include <asm/ioctls.h>
-
-struct winsize {
-        unsigned short ws_row;
-        unsigned short ws_col;
-        unsigned short ws_xpixel;
-        unsigned short ws_ypixel;
-};
-
-#define NCC 8
-struct termio {
-        unsigned short c_iflag;         /* input mode flags */
-        unsigned short c_oflag;         /* output mode flags */
-        unsigned short c_cflag;         /* control mode flags */
-        unsigned short c_lflag;         /* local mode flags */
-        unsigned char c_line;           /* line discipline */
-        unsigned char c_cc[NCC];        /* control characters */
-};
-
-/* modem lines */
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-#ifdef __KERNEL__
-
-/*      intr=^C         quit=^\         erase=del       kill=^U
-        eof=^D          vtime=\0        vmin=\1         sxtc=\0
-        start=^Q        stop=^S         susp=^Z         eol=\0
-        reprint=^R      discard=^U      werase=^W       lnext=^V
-        eol2=\0
-*/
-#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-
-/*
- * Translate a "termio" structure into a "termios". Ugh.
- */
-#define SET_LOW_TERMIOS_BITS(termios, termio, x) { \
-        unsigned short __tmp; \
-        get_user(__tmp,&(termio)->x); \
-        *(unsigned short *) &(termios)->x = __tmp; \
-}
-
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \
-        copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
-
-/*
- * Translate a "termios" structure into a "termio". Ugh.
- */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
-        put_user((termios)->c_iflag, &(termio)->c_iflag); \
-        put_user((termios)->c_oflag, &(termio)->c_oflag); \
-        put_user((termios)->c_cflag, &(termio)->c_cflag); \
-        put_user((termios)->c_lflag, &(termio)->c_lflag); \
-        put_user((termios)->c_line,  &(termio)->c_line); \
-        copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
-
-#endif  /* __KERNEL__ */
-
-#endif  /* __ASM_SH64_TERMIOS_H */
diff --git a/include/asm-sh64/thread_info.h b/include/asm-sh64/thread_info.h
deleted file mode 100644
index f6d5117c53af..000000000000
--- a/include/asm-sh64/thread_info.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef __ASM_SH64_THREAD_INFO_H
-#define __ASM_SH64_THREAD_INFO_H
-
-/*
- * SuperH 5 version
- * Copyright (C) 2003  Paul Mundt
- */
-
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-#include <asm/registers.h>
-
-/*
- * low level task data that entry.S needs immediate access to
- * - this struct should fit entirely inside of one cache line
- * - this struct shares the supervisor stack pages
- * - if the contents of this structure are changed, the assembly constants must also be changed
- */
-struct thread_info {
-        struct task_struct      *task;          /* main task structure */
-        struct exec_domain      *exec_domain;   /* execution domain */
-        unsigned long           flags;          /* low level flags */
-        /* Put the 4 32-bit fields together to make asm offsetting easier. */
-        int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
-        __u16                   cpu;
-
-        mm_segment_t            addr_limit;
-        struct restart_block    restart_block;
-
-        __u8                    supervisor_stack[0];
-};
-
-/*
- * macros/functions for gaining access to the thread information structure
- */
-#define INIT_THREAD_INFO(tsk)                   \
-{                                               \
-        .task           = &tsk,                 \
-        .exec_domain    = &default_exec_domain, \
-        .flags          = 0,                    \
-        .cpu            = 0,                    \
-        .preempt_count  = 1,                    \
-        .addr_limit     = KERNEL_DS,            \
-        .restart_block  = {                     \
-                .fn = do_no_restart_syscall,    \
-        },                                      \
-}
-
-#define init_thread_info        (init_thread_union.thread_info)
-#define init_stack              (init_thread_union.stack)
-
-/* how to get the thread information struct from C */
-static inline struct thread_info *current_thread_info(void)
-{
-        struct thread_info *ti;
-
-        __asm__ __volatile__ ("getcon " __KCR0 ", %0\n\t" : "=r" (ti));
-
-        return ti;
-}
-
-/* thread information allocation */
-
-
-
-#define alloc_thread_info(ti) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1))
-#define free_thread_info(ti) free_pages((unsigned long) (ti), 1)
-
-#endif /* __ASSEMBLY__ */
-
-#define THREAD_SIZE  8192
-
-#define PREEMPT_ACTIVE          0x10000000
-
-/* thread information flags */
-#define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_MEMDIE              4
-#define TIF_RESTORE_SIGMASK     5       /* Restore signal mask in do_signal */
-
-#define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
-#define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
-#define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
-#define _TIF_MEMDIE             (1 << TIF_MEMDIE)
-#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_THREAD_INFO_H */
diff --git a/include/asm-sh64/timex.h b/include/asm-sh64/timex.h
deleted file mode 100644
index 163e2b62fe27..000000000000
--- a/include/asm-sh64/timex.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __ASM_SH64_TIMEX_H
-#define __ASM_SH64_TIMEX_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/timex.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- * sh-5 architecture timex specifications
- *
- */
-
-#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
-#define CLOCK_TICK_FACTOR       20      /* Factor of both 1000000 and CLOCK_TICK_RATE */
-
-typedef unsigned long cycles_t;
-
-static __inline__ cycles_t get_cycles (void)
-{
-        return 0;
-}
-
-#define vxtime_lock()           do {} while (0)
-#define vxtime_unlock()         do {} while (0)
-
-#endif /* __ASM_SH64_TIMEX_H */
diff --git a/include/asm-sh64/tlbflush.h b/include/asm-sh64/tlbflush.h
deleted file mode 100644
index 16a164a23754..000000000000
--- a/include/asm-sh64/tlbflush.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __ASM_SH64_TLBFLUSH_H
-#define __ASM_SH64_TLBFLUSH_H
-
-#include <asm/pgalloc.h>
-
-/*
- * TLB flushing:
- *
- *  - flush_tlb() flushes the current mm struct TLBs
- *  - flush_tlb_all() flushes all processes TLBs
- *  - flush_tlb_mm(mm) flushes the specified mm context TLB's
- *  - flush_tlb_page(vma, vmaddr) flushes one page
- *  - flush_tlb_range(mm, start, end) flushes a range of pages
- *
- */
-
-extern void flush_tlb(void);
-extern void flush_tlb_all(void);
-extern void flush_tlb_mm(struct mm_struct *mm);
-extern void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
-                            unsigned long end);
-extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long page);
-
-extern void flush_tlb_kernel_range(unsigned long start, unsigned long end);
-
-#endif /* __ASM_SH64_TLBFLUSH_H */
-
diff --git a/include/asm-sh64/topology.h b/include/asm-sh64/topology.h
deleted file mode 100644
index 34211787345f..000000000000
--- a/include/asm-sh64/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_TOPOLOGY_H
-#define __ASM_SH64_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* __ASM_SH64_TOPOLOGY_H */
diff --git a/include/asm-sh64/types.h b/include/asm-sh64/types.h
deleted file mode 100644
index 2c7ad73b3883..000000000000
--- a/include/asm-sh64/types.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef __ASM_SH64_TYPES_H
-#define __ASM_SH64_TYPES_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/types.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#ifndef __ASSEMBLY__
-
-typedef unsigned short umode_t;
-
-/*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-#if defined(__GNUC__)
-__extension__ typedef __signed__ long long __s64;
-__extension__ typedef unsigned long long __u64;
-#endif
-
-#endif /* __ASSEMBLY__ */
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-
-typedef __signed__ char s8;
-typedef unsigned char u8;
-
-typedef __signed__ short s16;
-typedef unsigned short u16;
-
-typedef __signed__ int s32;
-typedef unsigned int u32;
-
-typedef __signed__ long long s64;
-typedef unsigned long long u64;
-
-/* DMA addresses come in generic and 64-bit flavours.  */
-
-#ifdef CONFIG_HIGHMEM64G
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
-typedef u64 dma64_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
-#define BITS_PER_LONG 32
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_TYPES_H */
diff --git a/include/asm-sh64/ucontext.h b/include/asm-sh64/ucontext.h
deleted file mode 100644
index cf77a08551ca..000000000000
--- a/include/asm-sh64/ucontext.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __ASM_SH64_UCONTEXT_H
-#define __ASM_SH64_UCONTEXT_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/ucontext.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-struct ucontext {
-        unsigned long     uc_flags;
-        struct ucontext  *uc_link;
-        stack_t           uc_stack;
-        struct sigcontext uc_mcontext;
-        sigset_t          uc_sigmask;   /* mask last for extensibility */
-};
-
-#endif /* __ASM_SH64_UCONTEXT_H */
diff --git a/include/asm-sh64/unaligned.h b/include/asm-sh64/unaligned.h
deleted file mode 100644
index 74481b186ae8..000000000000
--- a/include/asm-sh64/unaligned.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __ASM_SH64_UNALIGNED_H
-#define __ASM_SH64_UNALIGNED_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/unaligned.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <asm-generic/unaligned.h>
-
-#endif /* __ASM_SH64_UNALIGNED_H */
diff --git a/include/asm-sh64/user.h b/include/asm-sh64/user.h
deleted file mode 100644
index eb3b33edd73e..000000000000
--- a/include/asm-sh64/user.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef __ASM_SH64_USER_H
-#define __ASM_SH64_USER_H
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/user.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <linux/types.h>
-#include <asm/ptrace.h>
-#include <asm/page.h>
-
-/*
- * Core file format: The core file is written in such a way that gdb
- * can understand it and provide useful information to the user (under
- * linux we use the `trad-core' bfd).  The file contents are as follows:
- *
- *  upage: 1 page consisting of a user struct that tells gdb
- *      what is present in the file.  Directly after this is a
- *      copy of the task_struct, which is currently not used by gdb,
- *      but it may come in handy at some point.  All of the registers
- *      are stored as part of the upage.  The upage should always be
- *      only one page long.
- *  data: The data segment follows next.  We use current->end_text to
- *      current->brk to pick up all of the user variables, plus any memory
- *      that may have been sbrk'ed.  No attempt is made to determine if a
- *      page is demand-zero or if a page is totally unused, we just cover
- *      the entire range.  All of the addresses are rounded in such a way
- *      that an integral number of pages is written.
- *  stack: We need the stack information in order to get a meaningful
- *      backtrace.  We need to write the data from usp to
- *      current->start_stack, so we round each of these in order to be able
- *      to write an integer number of pages.
- */
-
-struct user_fpu_struct {
-        unsigned long long fp_regs[32];
-        unsigned int fpscr;
-};
-
-struct user {
-        struct pt_regs  regs;                   /* entire machine state */
-        struct user_fpu_struct fpu;     /* Math Co-processor registers  */
-        int u_fpvalid;          /* True if math co-processor being used */
-        size_t          u_tsize;                /* text size (pages) */
-        size_t          u_dsize;                /* data size (pages) */
-        size_t          u_ssize;                /* stack size (pages) */
-        unsigned long   start_code;             /* text starting address */
-        unsigned long   start_data;             /* data starting address */
-        unsigned long   start_stack;            /* stack starting address */
-        long int        signal;                 /* signal causing core dump */
-        struct regs *   u_ar0;                  /* help gdb find registers */
-        struct user_fpu_struct* u_fpstate;      /* Math Co-processor pointer */
-        unsigned long   magic;                  /* identifies a core file */
-        char            u_comm[32];             /* user command name */
-};
-
-#define NBPG                    PAGE_SIZE
-#define UPAGES                  1
-#define HOST_TEXT_START_ADDR    (u.start_code)
-#define HOST_DATA_START_ADDR    (u.start_data)
-#define HOST_STACK_END_ADDR     (u.start_stack + u.u_ssize * NBPG)
-
-#endif /* __ASM_SH64_USER_H */
diff --git a/init/Kconfig b/init/Kconfig
index 0eda68f0ad54..288444b4cd8a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -238,7 +238,7 @@ config AUDIT
 
 config AUDITSYSCALL
         bool "Enable system-call auditing support"
-        depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64)
+        depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64|| SUPERH)
         default y if SECURITY_SELINUX
         help
           Enable low-overhead system-call auditing infrastructure that
diff --git a/mm/Kconfig b/mm/Kconfig
index 9ef97417a0b9..0016ebd4dcba 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -187,7 +187,7 @@ config BOUNCE
 config NR_QUICK
         int
         depends on QUICKLIST
-        default "2" if (SUPERH && !SUPERH64)
+        default "2" if SUPERH
         default "1"
 
 config VIRT_TO_BUS