diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 02:32:19 -0500 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 02:32:19 -0500 |
| commit | 3f60db4bde17088feed5f143582d7661cdbb9a01 (patch) | |
| tree | 21a7866ae6d199cfa8f619ced9500687bdf84f18 /arch/m68k/mm/cache.c | |
| parent | 5e36097889725dbe4f098c3f1e93cb2f21cae6ee (diff) | |
| parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
Merge commit 'v3.3-rc4'
Diffstat (limited to 'arch/m68k/mm/cache.c')
| -rw-r--r-- | arch/m68k/mm/cache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/mm/cache.c b/arch/m68k/mm/cache.c index 95d0bf66e2e2..3d84c1f2ffb2 100644 --- a/arch/m68k/mm/cache.c +++ b/arch/m68k/mm/cache.c | |||
| @@ -52,9 +52,9 @@ static unsigned long virt_to_phys_slow(unsigned long vaddr) | |||
| 52 | unsigned long *descaddr; | 52 | unsigned long *descaddr; |
| 53 | 53 | ||
| 54 | asm volatile ("ptestr %3,%2@,#7,%0\n\t" | 54 | asm volatile ("ptestr %3,%2@,#7,%0\n\t" |
| 55 | "pmove %%psr,%1@" | 55 | "pmove %%psr,%1" |
| 56 | : "=a&" (descaddr) | 56 | : "=a&" (descaddr), "=m" (mmusr) |
| 57 | : "a" (&mmusr), "a" (vaddr), "d" (get_fs().seg)); | 57 | : "a" (vaddr), "d" (get_fs().seg)); |
| 58 | if (mmusr & (MMU_I|MMU_B|MMU_L)) | 58 | if (mmusr & (MMU_I|MMU_B|MMU_L)) |
| 59 | return 0; | 59 | return 0; |
| 60 | descaddr = phys_to_virt((unsigned long)descaddr); | 60 | descaddr = phys_to_virt((unsigned long)descaddr); |