From 91f593eff4f198638bc01000a6cbf8ada10c5e10 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 11 Apr 2008 13:46:54 +0200
Subject: [PATCH] --- yaml --- r: 88279 b: refs/heads/master c:
 b0fac02370cffad956ff3de5e8ed4df7e7b875d7 h: refs/heads/master i:   88277:
 817737f651e807e0104aa59e8f1b27676913e107   88275:
 06a842bda95837fef0d73fe01f59a6f200fb28d7   88271:
 a76dac119da365790b24f56c1abdcccd7847d065 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/linkage.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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