diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-11-10 20:35:53 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-28 13:18:44 +0900 |
| commit | 959f7d587e236a2d218f527771f156c336409d11 (patch) | |
| tree | 9cbc0ec58d072dc58c04e91488a8013518582af4 /arch | |
| parent | 256b22ca66987c537064dc25b0b267966189b5ba (diff) | |
sh: Move over the SH-5 head.S and tlb.h.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/kernel/Makefile_32 | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/Makefile_64 | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/head_32.S (renamed from arch/sh/kernel/head.S) | 0 | ||||
| -rw-r--r-- | arch/sh/kernel/head_64.S (renamed from arch/sh64/kernel/head.S) | 9 |
4 files changed, 4 insertions, 9 deletions
diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32 index 29b44eb3b93..35be5e9674f 100644 --- a/arch/sh/kernel/Makefile_32 +++ b/arch/sh/kernel/Makefile_32 @@ -2,7 +2,7 @@ # Makefile for the Linux/SuperH kernel. # -extra-y := head.o init_task.o vmlinux.lds +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 syscalls.o \ diff --git a/arch/sh/kernel/Makefile_64 b/arch/sh/kernel/Makefile_64 index fb87d642d1c..6e72ed4c07f 100644 --- a/arch/sh/kernel/Makefile_64 +++ b/arch/sh/kernel/Makefile_64 @@ -1,4 +1,4 @@ -extra-y := head.o init_task.o vmlinux.lds +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_sh64.o syscalls.o \ diff --git a/arch/sh/kernel/head.S b/arch/sh/kernel/head_32.S index 3338239717f..3338239717f 100644 --- a/arch/sh/kernel/head.S +++ b/arch/sh/kernel/head_32.S diff --git a/arch/sh64/kernel/head.S b/arch/sh/kernel/head_64.S index 186406d3ad9..8015af6d1da 100644 --- a/arch/sh64/kernel/head.S +++ b/arch/sh/kernel/head_64.S @@ -19,14 +19,11 @@ * lethal@linux-sh.org: 8th May 2004 * Add early SCIF console DTLB mapping. */ - - #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> /* @@ -368,5 +365,3 @@ hopeless: * (r32) _start_kernel address */ blink tr7, ZERO - - |