diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-05-09 01:38:49 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-09 01:38:49 -0400 |
commit | 2fedaacdc07e053d93e0607047a96d282f62aca2 (patch) | |
tree | 1306dd32d34c7224b15369eeba6be3999e30efd2 /arch/sh/mm | |
parent | e9e8b1fb995543c4cc3930f465923a552b2e48b7 (diff) |
sh: Cleanup irqflags size mismatch on SH-5 build.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm')
-rw-r--r-- | arch/sh/mm/cache-sh5.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/mm/cache-sh5.c b/arch/sh/mm/cache-sh5.c index 9e277ec7d536..86762092508c 100644 --- a/arch/sh/mm/cache-sh5.c +++ b/arch/sh/mm/cache-sh5.c | |||
@@ -60,7 +60,7 @@ static inline void sh64_teardown_dtlb_cache_slot(void) | |||
60 | static inline void sh64_icache_inv_all(void) | 60 | static inline void sh64_icache_inv_all(void) |
61 | { | 61 | { |
62 | unsigned long long addr, flag, data; | 62 | unsigned long long addr, flag, data; |
63 | unsigned int flags; | 63 | unsigned long flags; |
64 | 64 | ||
65 | addr = ICCR0; | 65 | addr = ICCR0; |
66 | flag = ICCR0_ICI; | 66 | flag = ICCR0_ICI; |
@@ -172,7 +172,7 @@ static void sh64_icache_inv_user_page_range(struct mm_struct *mm, | |||
172 | unsigned long eaddr; | 172 | unsigned long eaddr; |
173 | unsigned long after_last_page_start; | 173 | unsigned long after_last_page_start; |
174 | unsigned long mm_asid, current_asid; | 174 | unsigned long mm_asid, current_asid; |
175 | unsigned long long flags = 0ULL; | 175 | unsigned long flags = 0; |
176 | 176 | ||
177 | mm_asid = cpu_asid(smp_processor_id(), mm); | 177 | mm_asid = cpu_asid(smp_processor_id(), mm); |
178 | current_asid = get_asid(); | 178 | current_asid = get_asid(); |
@@ -236,7 +236,7 @@ static void sh64_icache_inv_user_small_range(struct mm_struct *mm, | |||
236 | unsigned long long eaddr = start; | 236 | unsigned long long eaddr = start; |
237 | unsigned long long eaddr_end = start + len; | 237 | unsigned long long eaddr_end = start + len; |
238 | unsigned long current_asid, mm_asid; | 238 | unsigned long current_asid, mm_asid; |
239 | unsigned long long flags; | 239 | unsigned long flags; |
240 | unsigned long long epage_start; | 240 | unsigned long long epage_start; |
241 | 241 | ||
242 | /* | 242 | /* |
@@ -342,7 +342,7 @@ static void inline sh64_dcache_purge_sets(int sets_to_purge_base, int n_sets) | |||
342 | * alloco is a NOP if the cache is write-through. | 342 | * alloco is a NOP if the cache is write-through. |
343 | */ | 343 | */ |
344 | if (test_bit(SH_CACHE_MODE_WT, &(cpu_data->dcache.flags))) | 344 | if (test_bit(SH_CACHE_MODE_WT, &(cpu_data->dcache.flags))) |
345 | ctrl_inb(eaddr); | 345 | __raw_readb((unsigned long)eaddr); |
346 | } | 346 | } |
347 | } | 347 | } |
348 | 348 | ||