diff --git a/[refs] b/[refs]
index 104259ba883d..9f9502ef65f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a34912d90c17a90d9fad12c4c51833b4e70707b
+refs/heads/master: 148c69b4b0ec267b08d3619651ae4a10a1768b04
diff --git a/trunk/include/asm-mn10300/processor.h b/trunk/include/asm-mn10300/processor.h
index f1b081f53468..73239271873d 100644
--- a/trunk/include/asm-mn10300/processor.h
+++ b/trunk/include/asm-mn10300/processor.h
@@ -58,7 +58,7 @@ extern struct mn10300_cpuinfo boot_cpu_data;
 extern void identify_cpu(struct mn10300_cpuinfo *);
 extern void print_cpu_info(struct mn10300_cpuinfo *);
 extern void dodgy_tsc(void);
-#define cpu_relax() do {} while (0)
+#define cpu_relax() barrier()
 
 /*
  * User space process size: 1.75GB (default).