X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Flinkage.h;h=147eb01e0d4bbe536da8bef077fac4ed8d9cdd37;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=c08c9983e840bf9587b6f2a7ae7c136d3f56ef7f;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index c08c9983e..147eb01e0 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -28,27 +28,17 @@
 #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"; \
-  ENTRY(name)
-
-#ifndef END
-#define END(name) \
-  .size name, .-name
-#endif
+  .globl name; \
+  ALIGN; \
+  name:
 
-#ifndef ENDPROC
-#define ENDPROC(name) \
-  .type name, @function; \
-  END(name)
-#endif
 
 #endif