Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

[linux-2.6] / include / linux / linkage.h

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index ff203dd029191d5b578707ce184655bcc02967da..3faf599ea58ec4cac70121f874efa9ec4d6ca5f4 100644 (file)
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -13,6 +13,10 @@
 #define asmlinkage CPP_ASMLINKAGE
 #endif
 
+#ifndef asmregparm
+# define asmregparm
+#endif
+
 #ifndef prevent_tail_call
 # define prevent_tail_call(ret) do { } while (0)
 #endif
@@ -53,6 +57,10 @@
   .size name, .-name
 #endif
 
+/* If symbol 'name' is treated as a subroutine (gets called, and returns)
+ * then please use ENDPROC to mark 'name' as STT_FUNC for the benefit of
+ * static analysis tools such as stack depth analyzer.
+ */
 #ifndef ENDPROC
 #define ENDPROC(name) \
   .type name, @function; \