Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[karo-tx-linux.git] / include / asm-parisc / linkage.h

diff --git a/include/asm-parisc/linkage.h b/include/asm-parisc/linkage.h
index 9df3978f8a9b57c3058fb38eb4df56ac05231c5c..ad8cd0d069eabd1a69fd6b802028950067b2e05e 100644 (file)
--- a/include/asm-parisc/linkage.h
+++ b/include/asm-parisc/linkage.h
@@ -7,12 +7,25 @@
 #endif
 
 /*
- * In parisc assembly a semicolon marks a comment.
- * Because of that we use an exclamation mark to seperate independend lines.
+ * In parisc assembly a semicolon marks a comment while a
+ * exclamation mark is used to seperate independent lines.
  */
+#ifdef __ASSEMBLY__
+
 #define ENTRY(name) \
-       .globl name !\
+       .export name !\
        ALIGN !\
 name:
 
+#ifdef CONFIG_64BIT
+#define ENDPROC(name) \
+       END(name)
+#else
+#define ENDPROC(name) \
+       .type name, @function !\
+       END(name)
+#endif
+
+#endif /* __ASSEMBLY__ */
+
 #endif  /* __ASM_PARISC_LINKAGE_H */