diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-11-28 06:19:38 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-27 23:18:58 -0500 |
commit | a23ba43573a24c351640bc19c06c701798fe6e25 (patch) | |
tree | b0d1481379ebe4d4345b7358ddffe16cf6d5c6f6 /arch/sh/mm | |
parent | 4b27c47cf8eddb4153a026e89c7b092598c98b12 (diff) |
sh: comment tidying for sh64->sh migration.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm')
-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 |
3 files changed, 22 insertions, 25 deletions
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 | |||