From: Helge Deller <deller@gmx.de>
Date: Mon, 28 May 2007 16:01:39 +0000 (+0200)
Subject: [PARISC] fix "ENTRY" macro redefinition
X-Git-Tag: v2.6.22-rc5~36^2~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2b6ebd50be76879261b67fc5fd29608b82ae443;p=linux-2.6

[PARISC] fix "ENTRY" macro redefinition

Thanks to James for noticing.

It fixes:
fs/ext3/xattr.c:65:1: warning: "ENTRY" redefined
In file included from include/linux/linkage.h:4,
                 from include/linux/fs.h:271,
                 from fs/ext3/xattr.c:54:
include/asm/linkage.h:13:1: warning: this is the location of the previous definition

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
---

diff --git a/include/asm-parisc/linkage.h b/include/asm-parisc/linkage.h
index 7a09d911b5..cdb470921a 100644
--- a/include/asm-parisc/linkage.h
+++ b/include/asm-parisc/linkage.h
@@ -10,6 +10,8 @@
  * In parisc assembly a semicolon marks a comment while a
  * exclamation mark is used to seperate independend lines.
  */
+#ifdef __ASSEMBLY__
+
 #define ENTRY(name) \
 	.export name !\
 	ALIGN !\
@@ -24,5 +26,6 @@ name:
 	END(name)
 #endif
 
+#endif /* __ASSEMBLY__ */
 
 #endif  /* __ASM_PARISC_LINKAGE_H */