Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 331417
b: refs/heads/master
c: 300b9ff
h: refs/heads/master
i:
  331415: c5d44d2
v: v3
  • Loading branch information
Philippe De Muyter authored and Greg Ungerer committed Sep 27, 2012
1 parent c3b39e8 commit 790bc60
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0c0e6db8068393400f5c0ccbb0d22bf14b56a7ca
refs/heads/master: 300b9ff609ca027b9964a453a8156e6fe0077cde
19 changes: 8 additions & 11 deletions trunk/arch/m68k/include/asm/cacheflush_no.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ static inline void __clear_cache_all(void)
{
#ifdef CACHE_INVALIDATE
__asm__ __volatile__ (
"movel %0, %%d0\n\t"
"movec %%d0, %%CACR\n\t"
"movec %0, %%CACR\n\t"
"nop\n\t"
: : "i" (CACHE_INVALIDATE) : "d0" );
: : "r" (CACHE_INVALIDATE) );
#endif
}

Expand All @@ -58,10 +57,9 @@ static inline void __flush_icache_all(void)
{
#ifdef CACHE_INVALIDATEI
__asm__ __volatile__ (
"movel %0, %%d0\n\t"
"movec %%d0, %%CACR\n\t"
"movec %0, %%CACR\n\t"
"nop\n\t"
: : "i" (CACHE_INVALIDATEI) : "d0" );
: : "r" (CACHE_INVALIDATEI) );
#endif
}

Expand All @@ -72,19 +70,18 @@ static inline void __flush_dcache_all(void)
#endif
#ifdef CACHE_INVALIDATED
__asm__ __volatile__ (
"movel %0, %%d0\n\t"
"movec %%d0, %%CACR\n\t"
"movec %0, %%CACR\n\t"
"nop\n\t"
: : "i" (CACHE_INVALIDATED) : "d0" );
: : "r" (CACHE_INVALIDATED) );
#else
/* Flush the wrtite buffer */
/* Flush the write buffer */
__asm__ __volatile__ ( "nop" );
#endif
}

/*
* Push cache entries at supplied address. We want to write back any dirty
* data and the invalidate the cache lines associated with this address.
* data and then invalidate the cache lines associated with this address.
*/
static inline void cache_push(unsigned long paddr, int len)
{
Expand Down

0 comments on commit 790bc60

Please sign in to comment.