diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 21:43:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 21:43:57 +0100 |
| commit | 0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a (patch) | |
| tree | 93eefb55eb9a9e41053e6de032e49e92c7be5574 /arch/m68k/atari/config.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | m68k: Fix assembler constraint to prevent overeager gcc optimisation (diff) | |
| download | linux-0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a.tar.xz linux-0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Fix assembler constraint to prevent overeager gcc optimisation
mac_esp: rename irq
mac_scsi: dont enable mac_scsi irq before requesting it
macfb: fix black and white modes
m68k/irq: Remove obsolete IRQ_FLG_* definitions
Fix up trivial conflict in arch/m68k/kernel/process_mm.c as per Geert.
Diffstat (limited to 'arch/m68k/atari/config.c')
| -rw-r--r-- | arch/m68k/atari/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index 4203d101363c..c4ac15c4f065 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c @@ -414,9 +414,9 @@ void __init config_atari(void) * FDC val = 4 -> Supervisor only */ asm volatile ("\n" " .chip 68030\n" - " pmove %0@,%/tt1\n" + " pmove %0,%/tt1\n" " .chip 68k" - : : "a" (&tt1_val)); + : : "m" (tt1_val)); } else { asm volatile ("\n" " .chip 68040\n" @@ -569,10 +569,10 @@ static void atari_reset(void) : "d0"); } else asm volatile ("\n" - " pmove %0@,%%tc\n" + " pmove %0,%%tc\n" " jmp %1@" : /* no outputs */ - : "a" (&tc_val), "a" (reset_addr)); + : "m" (tc_val), "a" (reset_addr)); } |