lguest: virtio-rng support

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / code-patching.h

diff --git a/include/asm-powerpc/code-patching.h b/include/asm-powerpc/code-patching.h
index fdb187cbc40d8f6d6df84c6a932917bec714fe5a..107d9b915e33e9559f14357a2e4f55cf3f857e82 100644 (file)
--- a/include/asm-powerpc/code-patching.h
+++ b/include/asm-powerpc/code-patching.h
@@ -10,6 +10,11 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <asm/types.h>
+
+#define PPC_NOP_INSTR          0x60000000
+#define PPC_LWSYNC_INSTR       0x7c2004ac
+
 /* Flags for create_branch:
  * "b"   == create_branch(addr, target, 0);
  * "ba"  == create_branch(addr, target, BRANCH_ABSOLUTE);
@@ -21,7 +26,29 @@
 
 unsigned int create_branch(const unsigned int *addr,
                           unsigned long target, int flags);
+unsigned int create_cond_branch(const unsigned int *addr,
+                               unsigned long target, int flags);
 void patch_branch(unsigned int *addr, unsigned long target, int flags);
 void patch_instruction(unsigned int *addr, unsigned int instr);
 
+int instr_is_relative_branch(unsigned int instr);
+int instr_is_branch_to_addr(const unsigned int *instr, unsigned long addr);
+unsigned long branch_target(const unsigned int *instr);
+unsigned int translate_branch(const unsigned int *dest,
+                             const unsigned int *src);
+
+static inline unsigned long ppc_function_entry(void *func)
+{
+#ifdef CONFIG_PPC64
+       /*
+        * On PPC64 the function pointer actually points to the function's
+        * descriptor. The first entry in the descriptor is the address
+        * of the function text.
+        */
+       return ((func_descr_t *)func)->entry;
+#else
+       return (unsigned long)func;
+#endif
+}
+
 #endif /* _ASM_POWERPC_CODE_PATCHING_H */