[PATCH] libata-hp-prep: add prereset() method and implement ata_std_prereset()

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

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 338f7795d8a071d63b05969505b6fe9894eafc46..c08c9983e840bf9587b6f2a7ae7c136d3f56ef7f 100644 (file)
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -28,10 +28,27 @@
 #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
+
+#ifndef ENDPROC
+#define ENDPROC(name) \
+  .type name, @function; \
+  END(name)
+#endif
 
 #endif