Messages in this thread Patch in this message | | | Subject | [PATCH 13/41] m68k: memory input should be an lvalue (mac/misc.c) | From | Al Viro <> | Date | Tue, 03 Jan 2006 23:27:30 +0000 |
| |
From: Al Viro <viro@zeniv.linux.org.uk> Date: 1133435982 -0500
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>
---
arch/m68k/mac/misc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
91ef822e75bc1e649c1f0e6aa25e3ac142869442 diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index 99dd2c1..bbb0c3b 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" -- 0.99.9.GIT - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |