Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/m68k/mac/misc.c

+2 −1
Original line number Diff line number Diff line
@@ -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"