diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-05 01:31:43 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-05 01:31:43 (GMT) |
| commit | 212e3499b2c69cc0899422973310e610d1c0666f (patch) | |
| tree | f0d314a0fa6e4a49dea50504be27ecfa38a932a0 /arch/blackfin/mach-common/cache.S | |
| parent | 971a967bce2639d802b988522ee43be576549f35 (diff) | |
| parent | be1229b4c52202033ba857e96e592777f08e8046 (diff) | |
| download | linux-fsl-qoriq-212e3499b2c69cc0899422973310e610d1c0666f.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: iflush: update anomaly 05000491 workaround
Blackfin: outs[lwb]: make sure count is greater than 0
Diffstat (limited to 'arch/blackfin/mach-common/cache.S')
| -rw-r--r-- | arch/blackfin/mach-common/cache.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/blackfin/mach-common/cache.S b/arch/blackfin/mach-common/cache.S index 790c767..ab4a925 100644 --- a/arch/blackfin/mach-common/cache.S +++ b/arch/blackfin/mach-common/cache.S @@ -58,6 +58,8 @@ 1: .ifeqs "\flushins", BROK_FLUSH_INST \flushins [P0++]; + nop; + nop; 2: nop; .else 2: \flushins [P0++]; |