diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/cayman/led.c | 2 | ||||
-rw-r--r-- | arch/sh/boot/compressed/Makefile_64 | 10 | ||||
-rw-r--r-- | arch/sh/boot/compressed/misc_64.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/irq/intc-sh5.c | 10 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh5/entry.S | 13 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh5/fpu.c | 10 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh5/switchto.S | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh5/unwind.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/head_64.S | 19 | ||||
-rw-r--r-- | arch/sh/kernel/process_64.c | 29 | ||||
-rw-r--r-- | arch/sh/kernel/sh_ksyms_64.c | 9 | ||||
-rw-r--r-- | arch/sh/kernel/signal_64.c | 11 | ||||
-rw-r--r-- | arch/sh/kernel/syscalls_64.S | 2 | ||||
-rw-r--r-- | arch/sh/kernel/time_64.c | 10 | ||||
-rw-r--r-- | arch/sh/kernel/traps_64.c | 14 | ||||
-rw-r--r-- | arch/sh/lib64/c-checksum.c | 5 | ||||
-rw-r--r-- | arch/sh/lib64/dbg.c | 2 | ||||
-rw-r--r-- | arch/sh/lib64/udelay.c | 2 | ||||
-rw-r--r-- | arch/sh/mm/cache-sh5.c | 15 | ||||
-rw-r--r-- | arch/sh/mm/extable_64.c | 28 | ||||
-rw-r--r-- | arch/sh/mm/tlb-sh5.c | 4 |
21 files changed, 87 insertions, 114 deletions
diff --git a/arch/sh/boards/cayman/led.c b/arch/sh/boards/cayman/led.c index b4e122fd9502..a808eac4ecd6 100644 --- a/arch/sh/boards/cayman/led.c +++ b/arch/sh/boards/cayman/led.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh64/mach-cayman/led.c | 2 | * arch/sh/boards/cayman/led.c |
3 | * | 3 | * |
4 | * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com> | 4 | * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com> |
5 | * | 5 | * |
diff --git a/arch/sh/boot/compressed/Makefile_64 b/arch/sh/boot/compressed/Makefile_64 index 0b48ae99922b..4334f2b86d8f 100644 --- a/arch/sh/boot/compressed/Makefile_64 +++ b/arch/sh/boot/compressed/Makefile_64 | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # linux/arch/sh64/boot/compressed/Makefile | 2 | # arch/sh/boot/compressed/Makefile_64 |
3 | # | 3 | # |
4 | # This file is subject to the terms and conditions of the GNU General Public | 4 | # create a compressed vmlinux image from the original vmlinux |
5 | # License. See the file "COPYING" in the main directory of this archive | ||
6 | # for more details. | ||
7 | # | 5 | # |
8 | # Copyright (C) 2002 Stuart Menefy | 6 | # Copyright (C) 2002 Stuart Menefy |
9 | # Copyright (C) 2004 Paul Mundt | 7 | # Copyright (C) 2004 Paul Mundt |
10 | # | 8 | # |
11 | # create a compressed vmlinux image from the original vmlinux | 9 | # This file is subject to the terms and conditions of the GNU General Public |
10 | # License. See the file "COPYING" in the main directory of this archive | ||
11 | # for more details. | ||
12 | # | 12 | # |
13 | 13 | ||
14 | targets := vmlinux vmlinux.bin vmlinux.bin.gz \ | 14 | targets := vmlinux vmlinux.bin vmlinux.bin.gz \ |
diff --git a/arch/sh/boot/compressed/misc_64.c b/arch/sh/boot/compressed/misc_64.c index aea00c53ce29..a006ef89b9dd 100644 --- a/arch/sh/boot/compressed/misc_64.c +++ b/arch/sh/boot/compressed/misc_64.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh64/boot/compressed/misc.c | 2 | * arch/sh/boot/compressed/misc_64.c |
3 | * | 3 | * |
4 | * This is a collection of several routines from gzip-1.0.3 | 4 | * This is a collection of several routines from gzip-1.0.3 |
5 | * adapted for Linux. | 5 | * adapted for Linux. |
diff --git a/arch/sh/kernel/cpu/irq/intc-sh5.c b/arch/sh/kernel/cpu/irq/intc-sh5.c index 49b845a31fff..43ee7a9a4f0b 100644 --- a/arch/sh/kernel/cpu/irq/intc-sh5.c +++ b/arch/sh/kernel/cpu/irq/intc-sh5.c | |||
@@ -1,18 +1,18 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | 2 | * arch/sh/kernel/cpu/irq/intc-sh5.c |
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | 3 | * |
6 | * arch/sh64/kernel/irq_intc.c | 4 | * Interrupt Controller support for SH5 INTC. |
7 | * | 5 | * |
8 | * Copyright (C) 2000, 2001 Paolo Alberelli | 6 | * Copyright (C) 2000, 2001 Paolo Alberelli |
9 | * Copyright (C) 2003 Paul Mundt | 7 | * Copyright (C) 2003 Paul Mundt |
10 | * | 8 | * |
11 | * Interrupt Controller support for SH5 INTC. | ||
12 | * Per-interrupt selective. IRLM=0 (Fixed priority) is not | 9 | * Per-interrupt selective. IRLM=0 (Fixed priority) is not |
13 | * supported being useless without a cascaded interrupt | 10 | * supported being useless without a cascaded interrupt |
14 | * controller. | 11 | * controller. |
15 | * | 12 | * |
13 | * This file is subject to the terms and conditions of the GNU General Public | ||
14 | * License. See the file "COPYING" in the main directory of this archive | ||
15 | * for more details. | ||
16 | */ | 16 | */ |
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S index dbf2d7684502..ba8750176d91 100644 --- a/arch/sh/kernel/cpu/sh5/entry.S +++ b/arch/sh/kernel/cpu/sh5/entry.S | |||
@@ -1,14 +1,13 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | 2 | * arch/sh/kernel/cpu/sh5/entry.S |
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * arch/sh64/kernel/entry.S | ||
7 | * | 3 | * |
8 | * Copyright (C) 2000, 2001 Paolo Alberelli | 4 | * Copyright (C) 2000, 2001 Paolo Alberelli |
9 | * Copyright (C) 2004, 2005 Paul Mundt | 5 | * Copyright (C) 2004 - 2007 Paul Mundt |
10 | * Copyright (C) 2003, 2004 Richard Curnow | 6 | * Copyright (C) 2003, 2004 Richard Curnow |
11 | * | 7 | * |
8 | * This file is subject to the terms and conditions of the GNU General Public | ||
9 | * License. See the file "COPYING" in the main directory of this archive | ||
10 | * for more details. | ||
12 | */ | 11 | */ |
13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
14 | #include <linux/sys.h> | 13 | #include <linux/sys.h> |
diff --git a/arch/sh/kernel/cpu/sh5/fpu.c b/arch/sh/kernel/cpu/sh5/fpu.c index 5a391b1a00e2..30b76a94abf2 100644 --- a/arch/sh/kernel/cpu/sh5/fpu.c +++ b/arch/sh/kernel/cpu/sh5/fpu.c | |||
@@ -1,9 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | 2 | * arch/sh/kernel/cpu/sh5/fpu.c |
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * arch/sh64/kernel/fpu.c | ||
7 | * | 3 | * |
8 | * Copyright (C) 2001 Manuela Cirronis, Paolo Alberelli | 4 | * Copyright (C) 2001 Manuela Cirronis, Paolo Alberelli |
9 | * Copyright (C) 2002 STMicroelectronics Limited | 5 | * Copyright (C) 2002 STMicroelectronics Limited |
@@ -12,8 +8,10 @@ | |||
12 | * Started from SH4 version: | 8 | * Started from SH4 version: |
13 | * Copyright (C) 1999, 2000 Kaz Kojima & Niibe Yutaka | 9 | * Copyright (C) 1999, 2000 Kaz Kojima & Niibe Yutaka |
14 | * | 10 | * |
11 | * This file is subject to the terms and conditions of the GNU General Public | ||
12 | * License. See the file "COPYING" in the main directory of this archive | ||
13 | * for more details. | ||
15 | */ | 14 | */ |
16 | |||
17 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
18 | #include <linux/signal.h> | 16 | #include <linux/signal.h> |
19 | #include <asm/processor.h> | 17 | #include <asm/processor.h> |
diff --git a/arch/sh/kernel/cpu/sh5/switchto.S b/arch/sh/kernel/cpu/sh5/switchto.S index 45b2d90eed7d..45c351b0f1ba 100644 --- a/arch/sh/kernel/cpu/sh5/switchto.S +++ b/arch/sh/kernel/cpu/sh5/switchto.S | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh64/kernel/switchto.S | 2 | * arch/sh/kernel/cpu/sh5/switchto.S |
3 | * | 3 | * |
4 | * sh64 context switch | 4 | * sh64 context switch |
5 | * | 5 | * |
diff --git a/arch/sh/kernel/cpu/sh5/unwind.c b/arch/sh/kernel/cpu/sh5/unwind.c index 1214c78e3584..119c20afd4e5 100644 --- a/arch/sh/kernel/cpu/sh5/unwind.c +++ b/arch/sh/kernel/cpu/sh5/unwind.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh64/kernel/unwind.c | 2 | * arch/sh/kernel/cpu/sh5/unwind.c |
3 | * | 3 | * |
4 | * Copyright (C) 2004 Paul Mundt | 4 | * Copyright (C) 2004 Paul Mundt |
5 | * Copyright (C) 2004 Richard Curnow | 5 | * Copyright (C) 2004 Richard Curnow |
diff --git a/arch/sh/kernel/head_64.S b/arch/sh/kernel/head_64.S index d3479287b10a..f42d4c0feb76 100644 --- a/arch/sh/kernel/head_64.S +++ b/arch/sh/kernel/head_64.S | |||
@@ -1,23 +1,12 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | 2 | * arch/sh/kernel/head_64.S |
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * arch/sh64/kernel/head.S | ||
7 | * | 3 | * |
8 | * Copyright (C) 2000, 2001 Paolo Alberelli | 4 | * Copyright (C) 2000, 2001 Paolo Alberelli |
9 | * Copyright (C) 2003, 2004 Paul Mundt | 5 | * Copyright (C) 2003, 2004 Paul Mundt |
10 | * | 6 | * |
11 | * | 7 | * This file is subject to the terms and conditions of the GNU General Public |
12 | * benedict.gaster@superh.com: 2nd May 2002 | 8 | * License. See the file "COPYING" in the main directory of this archive |
13 | * Moved definition of empty_zero_page to its own section allowing | 9 | * for more details. |
14 | * it to be placed at an absolute address known at load time. | ||
15 | * | ||
16 | * lethal@linux-sh.org: 9th May 2003 | ||
17 | * Kill off GLOBAL_NAME() usage. | ||
18 | * | ||
19 | * lethal@linux-sh.org: 8th May 2004 | ||
20 | * Add early SCIF console DTLB mapping. | ||
21 | */ | 10 | */ |
22 | #include <asm/page.h> | 11 | #include <asm/page.h> |
23 | #include <asm/cache.h> | 12 | #include <asm/cache.h> |
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c index 973dd1a3d292..cff3b7dc9c56 100644 --- a/arch/sh/kernel/process_64.c +++ b/arch/sh/kernel/process_64.c | |||
@@ -421,19 +421,22 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) | |||
421 | */ | 421 | */ |
422 | void exit_thread(void) | 422 | void exit_thread(void) |
423 | { | 423 | { |
424 | /* See arch/sparc/kernel/process.c for the precedent for doing this -- RPC. | 424 | /* |
425 | 425 | * See arch/sparc/kernel/process.c for the precedent for doing | |
426 | The SH-5 FPU save/restore approach relies on last_task_used_math | 426 | * this -- RPC. |
427 | pointing to a live task_struct. When another task tries to use the | 427 | * |
428 | FPU for the 1st time, the FPUDIS trap handling (see | 428 | * The SH-5 FPU save/restore approach relies on |
429 | arch/sh64/kernel/fpu.c) will save the existing FPU state to the | 429 | * last_task_used_math pointing to a live task_struct. When |
430 | FP regs field within last_task_used_math before re-loading the new | 430 | * another task tries to use the FPU for the 1st time, the FPUDIS |
431 | task's FPU state (or initialising it if the FPU has been used | 431 | * trap handling (see arch/sh/kernel/cpu/sh5/fpu.c) will save the |
432 | before). So if last_task_used_math is stale, and its page has already been | 432 | * existing FPU state to the FP regs field within |
433 | re-allocated for another use, the consequences are rather grim. Unless we | 433 | * last_task_used_math before re-loading the new task's FPU state |
434 | null it here, there is no other path through which it would get safely | 434 | * (or initialising it if the FPU has been used before). So if |
435 | nulled. */ | 435 | * last_task_used_math is stale, and its page has already been |
436 | 436 | * re-allocated for another use, the consequences are rather | |
437 | * grim. Unless we null it here, there is no other path through | ||
438 | * which it would get safely nulled. | ||
439 | */ | ||
437 | #ifdef CONFIG_SH_FPU | 440 | #ifdef CONFIG_SH_FPU |
438 | if (last_task_used_math == current) { | 441 | if (last_task_used_math == current) { |
439 | last_task_used_math = NULL; | 442 | last_task_used_math = NULL; |
diff --git a/arch/sh/kernel/sh_ksyms_64.c b/arch/sh/kernel/sh_ksyms_64.c index fbc991c33f5a..8004c38d3d37 100644 --- a/arch/sh/kernel/sh_ksyms_64.c +++ b/arch/sh/kernel/sh_ksyms_64.c | |||
@@ -1,12 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | 2 | * arch/sh/kernel/sh_ksyms_64.c |
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * arch/sh64/kernel/sh_ksyms.c | ||
7 | * | 3 | * |
8 | * Copyright (C) 2000, 2001 Paolo Alberelli | 4 | * Copyright (C) 2000, 2001 Paolo Alberelli |
9 | * | 5 | * |
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file "COPYING" in the main directory of this archive | ||
8 | * for more details. | ||
10 | */ | 9 | */ |
11 | #include <linux/rwsem.h> | 10 | #include <linux/rwsem.h> |
12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c index 922891960c33..80bde19d445b 100644 --- a/arch/sh/kernel/signal_64.c +++ b/arch/sh/kernel/signal_64.c | |||
@@ -1,16 +1,13 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | 2 | * arch/sh/kernel/signal_64.c |
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * arch/sh64/kernel/signal.c | ||
7 | * | 3 | * |
8 | * Copyright (C) 2000, 2001 Paolo Alberelli | 4 | * Copyright (C) 2000, 2001 Paolo Alberelli |
9 | * Copyright (C) 2003 Paul Mundt | 5 | * Copyright (C) 2003 Paul Mundt |
10 | * Copyright (C) 2004 Richard Curnow | 6 | * Copyright (C) 2004 Richard Curnow |
11 | * | 7 | * |
12 | * Started from sh version. | 8 | * This file is subject to the terms and conditions of the GNU General Public |
13 | * | 9 | * License. See the file "COPYING" in the main directory of this archive |
10 | * for more details. | ||
14 | */ | 11 | */ |
15 | #include <linux/rwsem.h> | 12 | #include <linux/rwsem.h> |
16 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S index abb94c05d07a..98a93efe3691 100644 --- a/arch/sh/kernel/syscalls_64.S +++ b/arch/sh/kernel/syscalls_64.S | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh64/kernel/syscalls.S | 2 | * arch/sh/kernel/syscalls_64.S |
3 | * | 3 | * |
4 | * Copyright (C) 2000, 2001 Paolo Alberelli | 4 | * Copyright (C) 2000, 2001 Paolo Alberelli |
5 | * Copyright (C) 2004 - 2007 Paul Mundt | 5 | * Copyright (C) 2004 - 2007 Paul Mundt |
diff --git a/arch/sh/kernel/time_64.c b/arch/sh/kernel/time_64.c index 81003af8115a..f819ba38a6ce 100644 --- a/arch/sh/kernel/time_64.c +++ b/arch/sh/kernel/time_64.c | |||
@@ -1,9 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | 2 | * arch/sh/kernel/time_64.c |
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * arch/sh64/kernel/time.c | ||
7 | * | 3 | * |
8 | * Copyright (C) 2000, 2001 Paolo Alberelli | 4 | * Copyright (C) 2000, 2001 Paolo Alberelli |
9 | * Copyright (C) 2003 - 2007 Paul Mundt | 5 | * Copyright (C) 2003 - 2007 Paul Mundt |
@@ -13,6 +9,10 @@ | |||
13 | * Copyright (C) 1999 Tetsuya Okada & Niibe Yutaka | 9 | * Copyright (C) 1999 Tetsuya Okada & Niibe Yutaka |
14 | * Some code taken from i386 version. | 10 | * Some code taken from i386 version. |
15 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds | 11 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds |
12 | * | ||
13 | * This file is subject to the terms and conditions of the GNU General Public | ||
14 | * License. See the file "COPYING" in the main directory of this archive | ||
15 | * for more details. | ||
16 | */ | 16 | */ |
17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
18 | #include <linux/rwsem.h> | 18 | #include <linux/rwsem.h> |
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c index b8020f26b635..c0b3c6f6edb5 100644 --- a/arch/sh/kernel/traps_64.c +++ b/arch/sh/kernel/traps_64.c | |||
@@ -1,19 +1,13 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | 2 | * arch/sh/kernel/traps_64.c |
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * arch/sh64/kernel/traps.c | ||
7 | * | 3 | * |
8 | * Copyright (C) 2000, 2001 Paolo Alberelli | 4 | * Copyright (C) 2000, 2001 Paolo Alberelli |
9 | * Copyright (C) 2003, 2004 Paul Mundt | 5 | * Copyright (C) 2003, 2004 Paul Mundt |
10 | * Copyright (C) 2003, 2004 Richard Curnow | 6 | * Copyright (C) 2003, 2004 Richard Curnow |
11 | * | 7 | * |
12 | */ | 8 | * This file is subject to the terms and conditions of the GNU General Public |
13 | 9 | * License. See the file "COPYING" in the main directory of this archive | |
14 | /* | 10 | * for more details. |
15 | * 'Traps.c' handles hardware traps and faults after we have saved some | ||
16 | * state in 'entry.S'. | ||
17 | */ | 11 | */ |
18 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
19 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/arch/sh/lib64/c-checksum.c b/arch/sh/lib64/c-checksum.c index 053137abd8a0..5dfbd8b5e558 100644 --- a/arch/sh/lib64/c-checksum.c +++ b/arch/sh/lib64/c-checksum.c | |||
@@ -1,12 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh64/lib/c-checksum.c | 2 | * arch/sh/lib64/c-checksum.c |
3 | * | 3 | * |
4 | * This file contains network checksum routines that are better done | 4 | * This file contains network checksum routines that are better done |
5 | * in an architecture-specific manner due to speed.. | 5 | * in an architecture-specific manner due to speed.. |
6 | */ | 6 | */ |
7 | |||
8 | #undef DEBUG | ||
9 | |||
10 | #include <linux/string.h> | 7 | #include <linux/string.h> |
11 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
12 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
diff --git a/arch/sh/lib64/dbg.c b/arch/sh/lib64/dbg.c index 97816e0baf19..75825ef6e084 100644 --- a/arch/sh/lib64/dbg.c +++ b/arch/sh/lib64/dbg.c | |||
@@ -2,7 +2,7 @@ | |||
2 | -- | 2 | -- |
3 | -- Identity : Linux50 Debug Funcions | 3 | -- Identity : Linux50 Debug Funcions |
4 | -- | 4 | -- |
5 | -- File : arch/sh64/lib/dbg.C | 5 | -- File : arch/sh/lib64/dbg.c |
6 | -- | 6 | -- |
7 | -- Copyright 2000, 2001 STMicroelectronics Limited. | 7 | -- Copyright 2000, 2001 STMicroelectronics Limited. |
8 | -- Copyright 2004 Richard Curnow (evt_debug etc) | 8 | -- Copyright 2004 Richard Curnow (evt_debug etc) |
diff --git a/arch/sh/lib64/udelay.c b/arch/sh/lib64/udelay.c index 4c71a7428e60..23c7d17fb9f7 100644 --- a/arch/sh/lib64/udelay.c +++ b/arch/sh/lib64/udelay.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh64/lib/udelay.c | 2 | * arch/sh/lib64/udelay.c |
3 | * | 3 | * |
4 | * Delay routines, using a pre-computed "loops_per_jiffy" value. | 4 | * Delay routines, using a pre-computed "loops_per_jiffy" value. |
5 | * | 5 | * |
diff --git a/arch/sh/mm/cache-sh5.c b/arch/sh/mm/cache-sh5.c index 421487cfff4c..4617e3aeee73 100644 --- a/arch/sh/mm/cache-sh5.c +++ b/arch/sh/mm/cache-sh5.c | |||
@@ -1,18 +1,15 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | 2 | * arch/sh/mm/cache-sh5.c |
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * arch/sh64/mm/cache.c | ||
7 | * | 3 | * |
8 | * Original version Copyright (C) 2000, 2001 Paolo Alberelli | 4 | * Original version Copyright (C) 2000, 2001 Paolo Alberelli |
9 | * Second version Copyright (C) benedict.gaster@superh.com 2002 | 5 | * Second version Copyright (C) benedict.gaster@superh.com 2002 |
10 | * Third version Copyright Richard.Curnow@superh.com 2003 | 6 | * Third version Copyright Richard.Curnow@superh.com 2003 |
11 | * Hacks to third version Copyright (C) 2003 Paul Mundt | 7 | * Hacks to third version Copyright (C) 2003 Paul Mundt |
8 | * | ||
9 | * This file is subject to the terms and conditions of the GNU General Public | ||
10 | * License. See the file "COPYING" in the main directory of this archive | ||
11 | * for more details. | ||
12 | */ | 12 | */ |
13 | |||
14 | /****************************************************************************/ | ||
15 | |||
16 | #include <linux/init.h> | 13 | #include <linux/init.h> |
17 | #include <linux/mman.h> | 14 | #include <linux/mman.h> |
18 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
@@ -146,7 +143,7 @@ int __init sh64_cache_init(void) | |||
146 | /* The following group of functions deal with mapping and unmapping a temporary | 143 | /* The following group of functions deal with mapping and unmapping a temporary |
147 | page into the DTLB slot that have been set aside for our exclusive use. */ | 144 | page into the DTLB slot that have been set aside for our exclusive use. */ |
148 | /* In order to accomplish this, we use the generic interface for adding and | 145 | /* In order to accomplish this, we use the generic interface for adding and |
149 | removing a wired slot entry as defined in arch/sh64/mm/tlb.c */ | 146 | removing a wired slot entry as defined in arch/sh/mm/tlb-sh5.c */ |
150 | /****************************************************************************/ | 147 | /****************************************************************************/ |
151 | 148 | ||
152 | static unsigned long slot_own_flags; | 149 | static unsigned long slot_own_flags; |
diff --git a/arch/sh/mm/extable_64.c b/arch/sh/mm/extable_64.c index a2e6e0563772..f05499688d88 100644 --- a/arch/sh/mm/extable_64.c +++ b/arch/sh/mm/extable_64.c | |||
@@ -1,14 +1,14 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | 2 | * arch/sh/mm/extable_64.c |
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * arch/sh64/mm/extable.c | ||
7 | * | 3 | * |
8 | * Copyright (C) 2003 Richard Curnow | 4 | * Copyright (C) 2003 Richard Curnow |
9 | * Copyright (C) 2003, 2004 Paul Mundt | 5 | * Copyright (C) 2003, 2004 Paul Mundt |
10 | * | 6 | * |
11 | * Cloned from the 2.5 SH version.. | 7 | * Cloned from the 2.5 SH version.. |
8 | * | ||
9 | * This file is subject to the terms and conditions of the GNU General Public | ||
10 | * License. See the file "COPYING" in the main directory of this archive | ||
11 | * for more details. | ||
12 | */ | 12 | */ |
13 | #include <linux/rwsem.h> | 13 | #include <linux/rwsem.h> |
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
@@ -21,13 +21,16 @@ static const struct exception_table_entry __copy_user_fixup_ex = { | |||
21 | .fixup = (unsigned long)&__copy_user_fixup, | 21 | .fixup = (unsigned long)&__copy_user_fixup, |
22 | }; | 22 | }; |
23 | 23 | ||
24 | /* Some functions that may trap due to a bad user-mode address have too many loads | 24 | /* |
25 | and stores in them to make it at all practical to label each one and put them all in | 25 | * Some functions that may trap due to a bad user-mode address have too |
26 | the main exception table. | 26 | * many loads and stores in them to make it at all practical to label |
27 | 27 | * each one and put them all in the main exception table. | |
28 | In particular, the fast memcpy routine is like this. It's fix-up is just to fall back | 28 | * |
29 | to a slow byte-at-a-time copy, which is handled the conventional way. So it's functionally | 29 | * In particular, the fast memcpy routine is like this. It's fix-up is |
30 | OK to just handle any trap occurring in the fast memcpy with that fixup. */ | 30 | * just to fall back to a slow byte-at-a-time copy, which is handled the |
31 | * conventional way. So it's functionally OK to just handle any trap | ||
32 | * occurring in the fast memcpy with that fixup. | ||
33 | */ | ||
31 | static const struct exception_table_entry *check_exception_ranges(unsigned long addr) | 34 | static const struct exception_table_entry *check_exception_ranges(unsigned long addr) |
32 | { | 35 | { |
33 | if ((addr >= (unsigned long)©_user_memcpy) && | 36 | if ((addr >= (unsigned long)©_user_memcpy) && |
@@ -77,4 +80,3 @@ int fixup_exception(struct pt_regs *regs) | |||
77 | 80 | ||
78 | return 0; | 81 | return 0; |
79 | } | 82 | } |
80 | |||
diff --git a/arch/sh/mm/tlb-sh5.c b/arch/sh/mm/tlb-sh5.c index d517e7d70340..f34274a1ded3 100644 --- a/arch/sh/mm/tlb-sh5.c +++ b/arch/sh/mm/tlb-sh5.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh64/mm/tlb.c | 2 | * arch/sh/mm/tlb-sh5.c |
3 | * | 3 | * |
4 | * Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org> | 4 | * Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org> |
5 | * Copyright (C) 2003 Richard Curnow <richard.curnow@superh.com> | 5 | * Copyright (C) 2003 Richard Curnow <richard.curnow@superh.com> |
@@ -7,7 +7,6 @@ | |||
7 | * This file is subject to the terms and conditions of the GNU General Public | 7 | * This file is subject to the terms and conditions of the GNU General Public |
8 | * License. See the file "COPYING" in the main directory of this archive | 8 | * License. See the file "COPYING" in the main directory of this archive |
9 | * for more details. | 9 | * for more details. |
10 | * | ||
11 | */ | 10 | */ |
12 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
@@ -163,4 +162,3 @@ inline void sh64_setup_tlb_slot(unsigned long long config_addr, | |||
163 | */ | 162 | */ |
164 | inline void sh64_teardown_tlb_slot(unsigned long long config_addr) | 163 | inline void sh64_teardown_tlb_slot(unsigned long long config_addr) |
165 | __attribute__ ((alias("__flush_tlb_slot"))); | 164 | __attribute__ ((alias("__flush_tlb_slot"))); |
166 | |||