sh: Kill off the rest of arch/sh64/kernel/.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
git-mirror · Jan 28, 2008 · b4eaa1c · b4eaa1c
1 parent 18bc813
commit b4eaa1c
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 1,073 deletions.
diff --git a/arch/sh64/kernel/pci_sh5.c → arch/sh/drivers/pci/pci-sh5.c b/arch/sh64/kernel/pci_sh5.c → arch/sh/drivers/pci/pci-sh5.c
diff --git a/arch/sh64/kernel/pci_sh5.h → arch/sh/drivers/pci/pci-sh5.h b/arch/sh64/kernel/pci_sh5.h → arch/sh/drivers/pci/pci-sh5.h
diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32
@@ -6,7 +6,7 @@ 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.o topology.o traps.o traps_32.o
+	   syscalls_32.o time_32.o topology.o traps.o traps_32.o
 
 obj-y				+= cpu/ timers/
 obj-$(CONFIG_VSYSCALL)		+= vsyscall/

diff --git a/arch/sh/kernel/Makefile_64 b/arch/sh/kernel/Makefile_64
@@ -2,7 +2,7 @@ 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.o topology.o traps.o traps_64.o
+	   syscalls_64.o time_64.o topology.o traps.o traps_64.o
 
 obj-y				+= cpu/ timers/
 obj-$(CONFIG_VSYSCALL)		+= vsyscall/

diff --git a/arch/sh/kernel/time.c → arch/sh/kernel/time_32.c b/arch/sh/kernel/time.c → arch/sh/kernel/time_32.c
diff --git a/arch/sh64/kernel/time.c → arch/sh/kernel/time_64.c b/arch/sh64/kernel/time.c → arch/sh/kernel/time_64.c
@@ -31,14 +31,14 @@
 #include <linux/bcd.h>
 #include <linux/timex.h>
 #include <linux/irq.h>
+#include <linux/io.h>
 #include <linux/platform_device.h>
-#include <asm/registers.h>	 /* required by inline __asm__ stmt. */
+#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 <asm/hardware.h>
 
 #define TMU_TOCR_INIT	0x00
 #define TMU0_TCR_INIT	0x0020
@@ -240,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
 
 	/*

diff --git a/arch/sh64/kernel/Makefile b/arch/sh64/kernel/Makefile
diff --git a/arch/sh64/kernel/alphanum.c b/arch/sh64/kernel/alphanum.c