X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Flinkage.h;h=6c9873f8828751d9c48c3c2a5b0eeef793855233;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=147eb01e0d4bbe536da8bef077fac4ed8d9cdd37;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 147eb01e0..6c9873f88 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -1,7 +1,6 @@
 #ifndef _LINUX_LINKAGE_H
 #define _LINUX_LINKAGE_H
 
-#include <linux/config.h>
 #include <asm/linkage.h>
 
 #ifdef __cplusplus
@@ -28,17 +27,31 @@
 #define ALIGN __ALIGN
 #define ALIGN_STR __ALIGN_STR
 
+#ifndef ENTRY
 #define ENTRY(name) \
   .globl name; \
   ALIGN; \
   name:
+#endif
 
 #define KPROBE_ENTRY(name) \
-  .section .kprobes.text, "ax"; \
-  .globl name; \
-  ALIGN; \
-  name:
+  .pushsection .kprobes.text, "ax"; \
+  ENTRY(name)
 
+#define KPROBE_END(name) \
+  END(name);		 \
+  .popsection
+
+#ifndef END
+#define END(name) \
+  .size name, .-name
+#endif
+
+#ifndef ENDPROC
+#define ENDPROC(name) \
+  .type name, @function; \
+  END(name)
+#endif
 
 #endif