Commit 77add9f3 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 84a65cc6
...@@ -572,12 +572,13 @@ void mac_reset(void) ...@@ -572,12 +572,13 @@ void mac_reset(void)
/* make a 1-to-1 mapping, using the transparent tran. reg. */ /* make a 1-to-1 mapping, using the transparent tran. reg. */
unsigned long virt = (unsigned long) mac_reset; unsigned long virt = (unsigned long) mac_reset;
unsigned long phys = virt_to_phys(mac_reset); unsigned long phys = virt_to_phys(mac_reset);
unsigned long addr = (phys&0xFF000000)|0x8777;
unsigned long offset = phys-virt; unsigned long offset = phys-virt;
local_irq_disable(); /* lets not screw this up, ok? */ local_irq_disable(); /* lets not screw this up, ok? */
__asm__ __volatile__(".chip 68030\n\t" __asm__ __volatile__(".chip 68030\n\t"
"pmove %0,%/tt0\n\t" "pmove %0,%/tt0\n\t"
".chip 68k" ".chip 68k"
: : "m" ((phys&0xFF000000)|0x8777)); : : "m" (addr));
/* Now jump to physical address so we can disable MMU */ /* Now jump to physical address so we can disable MMU */
__asm__ __volatile__( __asm__ __volatile__(
".chip 68030\n\t" ".chip 68030\n\t"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment