diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 10:06:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 18:09:01 +0100 |
| commit | 77add9f3e6a486e5623f3e693ded216f155bd2a5 (patch) | |
| tree | 56f74f931a03f566011d0d946f69a17acd9e34b6 /arch/m68k/mac/misc.c | |
| parent | [PATCH] m68k: static vs. extern in amigaints.h (diff) | |
| download | linux-77add9f3e6a486e5623f3e693ded216f155bd2a5.tar.xz linux-77add9f3e6a486e5623f3e693ded216f155bd2a5.zip | |
[PATCH] m68k: memory input should be an lvalue (mac/misc.c)
gcc4 is less forgiving and wants memory inputs to be real lvalues; variable
added and value stored in it explicitly before doing __asm__.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/m68k/mac/misc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index 99dd2c1e9f44..bbb0c3b95e9c 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c @@ -572,12 +572,13 @@ void mac_reset(void) /* make a 1-to-1 mapping, using the transparent tran. reg. */ unsigned long virt = (unsigned long) mac_reset; unsigned long phys = virt_to_phys(mac_reset); + unsigned long addr = (phys&0xFF000000)|0x8777; unsigned long offset = phys-virt; local_irq_disable(); /* lets not screw this up, ok? */ __asm__ __volatile__(".chip 68030\n\t" "pmove %0,%/tt0\n\t" ".chip 68k" - : : "m" ((phys&0xFF000000)|0x8777)); + : : "m" (addr)); /* Now jump to physical address so we can disable MMU */ __asm__ __volatile__( ".chip 68030\n\t" |