aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/kernel/process_mm.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-26 12:43:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-26 12:43:57 -0800
commit0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a (patch)
tree93eefb55eb9a9e41053e6de032e49e92c7be5574 /arch/m68k/kernel/process_mm.c
parent87f71ae2dd7471c1b4c94100be1f218e91dc64c3 (diff)
parent2a3535069e33d8b416f406c159ce924427315303 (diff)
downloadlinux-linaro-stable-0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a.tar.gz
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/kernel/process_mm.c')
-rw-r--r--arch/m68k/kernel/process_mm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/process_mm.c b/arch/m68k/kernel/process_mm.c
index 125f34e00bf0..099283ee1a8f 100644
--- a/arch/m68k/kernel/process_mm.c
+++ b/arch/m68k/kernel/process_mm.c
@@ -172,7 +172,7 @@ void flush_thread(void)
current->thread.fs = __USER_DS;
if (!FPU_IS_EMU)
- asm volatile ("frestore %0@" : : "a" (&zero) : "memory");
+ asm volatile("frestore %0": :"m" (zero));
}
/*