Skip to contentSkip to conversation

m68k: memory input should be an lvalue (mac/misc.c)

PATCH In review Al Viro 1 participant 1 message Dec 22, 2005

Subsystems (2)
m68k architecture m68k on Apple macintosh
lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 14/36 m68k: memory input should be an lvalue (mac/misc.c)

From: Al Viro <[email protected]>
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 <[email protected]>

---

 arch/m68k/mac/misc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

d084097faa15a24b42e36c3db025c7fa28a70876

arch/m68k/mac/misc.c +2 -1
index 99dd2c1..bbb0c3b 100644
@@ -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"
Signature · 1 line
0.99.9.GIT