x86: Fix alternatives and kprobes to remap write-protected kernel text

[linux-2.6.git] / include / asm-i386 / alternative.h

diff --git a/include/asm-i386/alternative.h b/include/asm-i386/alternative.h
index 0f70b379b029cca89aa8cded9d705b282e9c6fa7..bda6c810c0f4e3ac48973f3af52fdd478862f05b 100644 (file)
--- a/include/asm-i386/alternative.h
+++ b/include/asm-i386/alternative.h
@@ -97,6 +97,12 @@ static inline void alternatives_smp_switch(int smp) {}
                      "663:\n\t" newinstr "\n664:\n"   /* replacement */ \
                      ".previous" : output : [feat] "i" (feature), ##input)
 
+/*
+ * use this macro(s) if you need more than one output parameter
+ * in alternative_io
+ */
+#define ASM_OUTPUT2(a, b) a, b
+
 /*
  * Alternative inline assembly for SMP.
  *
@@ -143,4 +149,6 @@ apply_paravirt(struct paravirt_patch_site *start,
 #define __parainstructions_end NULL
 #endif
 
+extern void text_poke(void *addr, unsigned char *opcode, int len);
+
 #endif /* _I386_ALTERNATIVE_H */