linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 932021f..147eb01 100644 (file)
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_LINKAGE_H
 #define _LINUX_LINKAGE_H
 
+#include <linux/config.h>
 #include <asm/linkage.h>
 
 #ifdef __cplusplus
@@ -27,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