diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:43:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:43:09 -0400 |
commit | 515b696b282f856c3ad1679ccd658120faa387d0 (patch) | |
tree | d9d7c1185c396617f128ca23463062308d11393b /arch/sh/mm/cache-sh3.c | |
parent | fa877c71e2136bd682b45022c96d5e073ced9f58 (diff) | |
parent | 064a16dc41be879d12bd5de5d2f9d38d890e0ee7 (diff) |
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: (262 commits)
sh: mach-ecovec24: Add user debug switch support
sh: Kill off unused se_skipped in alignment trap notification code.
sh: Wire up HAVE_SYSCALL_TRACEPOINTS.
video: sh_mobile_lcdcfb: use both register sets for display panning
video: sh_mobile_lcdcfb: implement display panning
sh: Fix up sh7705 flush_dcache_page() build.
sh: kfr2r09: document the PLL/FLL <-> RF relationship.
sh: mach-ecovec24: need asm/clock.h.
sh: mach-ecovec24: deassert usb irq on boot.
sh: Add KEYSC support for EcoVec24
sh: add kycr2_delay for sh_keysc
sh: cpufreq: Include CPU id in info messages.
sh: multi-evt support for SH-X3 proto CPU.
sh: clkfwk: remove bogus set_bus_parent() from SH7709.
sh: Fix the indication point of the liquid crystal of AP-325RXA(AP3300)
sh: Add EcoVec24 romImage defconfig
sh: USB disable process is needed if romImage boot for EcoVec24
sh: EcoVec24: add HIZA setting for LED
sh: EcoVec24: write MAC address in boot
sh: Add romImage support for EcoVec24
...
Diffstat (limited to 'arch/sh/mm/cache-sh3.c')
-rw-r--r-- | arch/sh/mm/cache-sh3.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/arch/sh/mm/cache-sh3.c b/arch/sh/mm/cache-sh3.c index 6d1dbec08ad4..faef80c98134 100644 --- a/arch/sh/mm/cache-sh3.c +++ b/arch/sh/mm/cache-sh3.c | |||
@@ -32,7 +32,7 @@ | |||
32 | * SIZE: Size of the region. | 32 | * SIZE: Size of the region. |
33 | */ | 33 | */ |
34 | 34 | ||
35 | void __flush_wback_region(void *start, int size) | 35 | static void sh3__flush_wback_region(void *start, int size) |
36 | { | 36 | { |
37 | unsigned long v, j; | 37 | unsigned long v, j; |
38 | unsigned long begin, end; | 38 | unsigned long begin, end; |
@@ -71,7 +71,7 @@ void __flush_wback_region(void *start, int size) | |||
71 | * START: Virtual Address (U0, P1, or P3) | 71 | * START: Virtual Address (U0, P1, or P3) |
72 | * SIZE: Size of the region. | 72 | * SIZE: Size of the region. |
73 | */ | 73 | */ |
74 | void __flush_purge_region(void *start, int size) | 74 | static void sh3__flush_purge_region(void *start, int size) |
75 | { | 75 | { |
76 | unsigned long v; | 76 | unsigned long v; |
77 | unsigned long begin, end; | 77 | unsigned long begin, end; |
@@ -90,11 +90,16 @@ void __flush_purge_region(void *start, int size) | |||
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
93 | /* | 93 | void __init sh3_cache_init(void) |
94 | * No write back please | 94 | { |
95 | * | 95 | __flush_wback_region = sh3__flush_wback_region; |
96 | * Except I don't think there's any way to avoid the writeback. So we | 96 | __flush_purge_region = sh3__flush_purge_region; |
97 | * just alias it to __flush_purge_region(). dwmw2. | 97 | |
98 | */ | 98 | /* |
99 | void __flush_invalidate_region(void *start, int size) | 99 | * No write back please |
100 | __attribute__((alias("__flush_purge_region"))); | 100 | * |
101 | * Except I don't think there's any way to avoid the writeback. | ||
102 | * So we just alias it to sh3__flush_purge_region(). dwmw2. | ||
103 | */ | ||
104 | __flush_invalidate_region = sh3__flush_purge_region; | ||
105 | } | ||