aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/system.h
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2008-06-23 21:32:21 -0400
committerPaul Mackerras <paulus@samba.org>2008-06-30 21:28:18 -0400
commitaaddd3eacaeaef3503035750b3f21ac2bfe97cbf (patch)
tree2bac0bedc2185edec916679d218e1c8b89276453 /include/asm-powerpc/system.h
parent73f38fe1b563a9d23ffacbda7b51decf41b0c49c (diff)
powerpc: Move code patching code into arch/powerpc/lib/code-patching.c
We currently have a few routines for patching code in asm/system.h, because they didn't fit anywhere else. I'd like to clean them up a little and add some more, so first move them into a dedicated C file - they don't need to be inlined. While we're moving the code, drop create_function_call(), it's intended caller never got merged and will be replaced in future with something different. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/system.h')
-rw-r--r--include/asm-powerpc/system.h48
1 files changed, 0 insertions, 48 deletions
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index 145b70f6d22b..2642a92b724f 100644
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -526,54 +526,6 @@ extern void reloc_got2(unsigned long);
526 526
527#define PTRRELOC(x) ((typeof(x)) add_reloc_offset((unsigned long)(x))) 527#define PTRRELOC(x) ((typeof(x)) add_reloc_offset((unsigned long)(x)))
528 528
529static inline void create_instruction(unsigned long addr, unsigned int instr)
530{
531 unsigned int *p;
532 p = (unsigned int *)addr;
533 *p = instr;
534 asm ("dcbst 0, %0; sync; icbi 0,%0; sync; isync" : : "r" (p));
535}
536
537/* Flags for create_branch:
538 * "b" == create_branch(addr, target, 0);
539 * "ba" == create_branch(addr, target, BRANCH_ABSOLUTE);
540 * "bl" == create_branch(addr, target, BRANCH_SET_LINK);
541 * "bla" == create_branch(addr, target, BRANCH_ABSOLUTE | BRANCH_SET_LINK);
542 */
543#define BRANCH_SET_LINK 0x1
544#define BRANCH_ABSOLUTE 0x2
545
546static inline void create_branch(unsigned long addr,
547 unsigned long target, int flags)
548{
549 unsigned int instruction;
550
551 if (! (flags & BRANCH_ABSOLUTE))
552 target = target - addr;
553
554 /* Mask out the flags and target, so they don't step on each other. */
555 instruction = 0x48000000 | (flags & 0x3) | (target & 0x03FFFFFC);
556
557 create_instruction(addr, instruction);
558}
559
560static inline void create_function_call(unsigned long addr, void * func)
561{
562 unsigned long func_addr;
563
564#ifdef CONFIG_PPC64
565 /*
566 * On PPC64 the function pointer actually points to the function's
567 * descriptor. The first entry in the descriptor is the address
568 * of the function text.
569 */
570 func_addr = *(unsigned long *)func;
571#else
572 func_addr = (unsigned long)func;
573#endif
574 create_branch(addr, func_addr, BRANCH_SET_LINK);
575}
576
577#ifdef CONFIG_VIRT_CPU_ACCOUNTING 529#ifdef CONFIG_VIRT_CPU_ACCOUNTING
578extern void account_system_vtime(struct task_struct *); 530extern void account_system_vtime(struct task_struct *);
579#endif 531#endif