diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2009-11-09 10:55:36 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-09 10:55:36 +0900 |
| commit | 76d2318020bf0c0c497af986a25977196715a1b9 (patch) | |
| tree | 25df17084b76eba7420c3fe9e6690ea5270e7dfd /arch/sh | |
| parent | sh: oprofile: Fix up count size mismatch for common impl. (diff) | |
| parent | sh: Replace old style lock initializer (diff) | |
| download | linux-dev-76d2318020bf0c0c497af986a25977196715a1b9.tar.xz linux-dev-76d2318020bf0c0c497af986a25977196715a1b9.zip | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/rwsem.h | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/dwarf.c | 2 | ||||
| -rw-r--r-- | arch/sh/mm/cache-sh4.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/sh/include/asm/rwsem.h b/arch/sh/include/asm/rwsem.h index 1987f3ea7f1b..06e2251a5e48 100644 --- a/arch/sh/include/asm/rwsem.h +++ b/arch/sh/include/asm/rwsem.h @@ -41,7 +41,7 @@ struct rw_semaphore { #endif #define __RWSEM_INITIALIZER(name) \ - { RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \ + { RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \ LIST_HEAD_INIT((name).wait_list) \ __RWSEM_DEP_MAP_INIT(name) } diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c index 6c9d0c10f2be..3576b709f052 100644 --- a/arch/sh/kernel/dwarf.c +++ b/arch/sh/kernel/dwarf.c @@ -567,7 +567,7 @@ struct dwarf_frame * dwarf_unwind_stack(unsigned long pc, * NOTE: the return address is guaranteed to be setup by the * time this function makes its first function call. */ - if (!pc && !prev) + if (!pc || !prev) pc = (unsigned long)current_text_addr(); #ifdef CONFIG_FUNCTION_GRAPH_TRACER diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c index b5abe949c6ed..6bfd08d5fb81 100644 --- a/arch/sh/mm/cache-sh4.c +++ b/arch/sh/mm/cache-sh4.c @@ -65,6 +65,7 @@ static void __uses_jump_to_uncached sh4_flush_icache_range(void *args) for (v = start; v < end; v += L1_CACHE_BYTES) { unsigned long icacheaddr; + int j, n; __ocbwb(v); @@ -72,8 +73,10 @@ static void __uses_jump_to_uncached sh4_flush_icache_range(void *args) cpu_data->icache.entry_mask); /* Clear i-cache line valid-bit */ + n = boot_cpu_data.icache.n_aliases; for (i = 0; i < cpu_data->icache.ways; i++) { - __raw_writel(0, icacheaddr); + for (j = 0; j < n; j++) + __raw_writel(0, icacheaddr + (j * PAGE_SIZE)); icacheaddr += cpu_data->icache.way_incr; } } |