diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 15:15:49 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 15:15:49 +0900 |
commit | 9aa7719e0c6a1580451900e672744752804f8f75 (patch) | |
tree | ba36c5536342db2759d0a1843dffd0c193e26ff0 /arch/mn10300/mm/cache-dbg-flush-by-reg.S | |
parent | 583af252ab07cd1e8721878463da5b7016c18fdc (diff) | |
parent | 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff) | |
download | kernel_goldelico_gta04-9aa7719e0c6a1580451900e672744752804f8f75.zip kernel_goldelico_gta04-9aa7719e0c6a1580451900e672744752804f8f75.tar.gz kernel_goldelico_gta04-9aa7719e0c6a1580451900e672744752804f8f75.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'arch/mn10300/mm/cache-dbg-flush-by-reg.S')
-rw-r--r-- | arch/mn10300/mm/cache-dbg-flush-by-reg.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mn10300/mm/cache-dbg-flush-by-reg.S b/arch/mn10300/mm/cache-dbg-flush-by-reg.S index 665919f..a775ea5 100644 --- a/arch/mn10300/mm/cache-dbg-flush-by-reg.S +++ b/arch/mn10300/mm/cache-dbg-flush-by-reg.S @@ -120,14 +120,14 @@ debugger_local_cache_flushinv_one: # conditionally purge this line in all ways mov d1,(L1_CACHE_WAYDISP*0,a0) -debugger_local_cache_flushinv_no_dcache: +debugger_local_cache_flushinv_one_no_dcache: # # now try to flush the icache # mov CHCTR,a0 movhu (a0),d0 btst CHCTR_ICEN,d0 - beq mn10300_local_icache_inv_range_reg_end + beq debugger_local_cache_flushinv_one_end LOCAL_CLI_SAVE(d1) |