[parisc-linux] [PATCH] [PARISC] fix "ENTRY" redefinition between linkage.h and xattr.c

Helge Deller deller at gmx.de
Mon May 28 10:01:39 MDT 2007


[PATCH] fix "ENTRY" redefinition between linkage.h and xattr.c

Signed-off-by: Helge Deller <deller at gmx.de>

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



diff --git a/include/asm-parisc/linkage.h b/include/asm-parisc/linkage.h
index 7a09d91..cdb4709 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 */



More information about the parisc-linux mailing list