diff --git a/[refs] b/[refs]
index a25c96d179ed..7b99380d7dba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 099ce8f4712dcff975ed7619f831b4df95aac773
+refs/heads/master: b0fac02370cffad956ff3de5e8ed4df7e7b875d7
diff --git a/trunk/include/linux/linkage.h b/trunk/include/linux/linkage.h
index b163c5c40dbc..2119610b24f8 100644
--- a/trunk/include/linux/linkage.h
+++ b/trunk/include/linux/linkage.h
@@ -30,9 +30,12 @@
  * protection to work (ie no more work that the compiler might
  * end up needing stack temporaries for).
  */
+/* Assembly files may be compiled with -traditional .. */
+#ifndef __ASSEMBLY__
 #ifndef asmlinkage_protect
 # define asmlinkage_protect(n, ret, args...)	do { } while (0)
 #endif
+#endif
 
 #ifndef __ALIGN
 #define __ALIGN		.align 4,0x90