aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mac
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 04:06:18 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 12:09:01 -0500
commit77add9f3e6a486e5623f3e693ded216f155bd2a5 (patch)
tree56f74f931a03f566011d0d946f69a17acd9e34b6 /arch/m68k/mac
parent84a65cc6c18848fcee9c9ae8766bb5c60787d21b (diff)
[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 'arch/m68k/mac')
-rw-r--r--arch/m68k/mac/misc.c3
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)
572 /* make a 1-to-1 mapping, using the transparent tran. reg. */ 572 /* make a 1-to-1 mapping, using the transparent tran. reg. */
573 unsigned long virt = (unsigned long) mac_reset; 573 unsigned long virt = (unsigned long) mac_reset;
574 unsigned long phys = virt_to_phys(mac_reset); 574 unsigned long phys = virt_to_phys(mac_reset);
575 unsigned long addr = (phys&0xFF000000)|0x8777;
575 unsigned long offset = phys-virt; 576 unsigned long offset = phys-virt;
576 local_irq_disable(); /* lets not screw this up, ok? */ 577 local_irq_disable(); /* lets not screw this up, ok? */
577 __asm__ __volatile__(".chip 68030\n\t" 578 __asm__ __volatile__(".chip 68030\n\t"
578 "pmove %0,%/tt0\n\t" 579 "pmove %0,%/tt0\n\t"
579 ".chip 68k" 580 ".chip 68k"
580 : : "m" ((phys&0xFF000000)|0x8777)); 581 : : "m" (addr));
581 /* Now jump to physical address so we can disable MMU */ 582 /* Now jump to physical address so we can disable MMU */
582 __asm__ __volatile__( 583 __asm__ __volatile__(
583 ".chip 68030\n\t" 584 ".chip 68030\n\t"