aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/lib/code-patching.c
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 /arch/powerpc/lib/code-patching.c
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 'arch/powerpc/lib/code-patching.c')
-rw-r--r--arch/powerpc/lib/code-patching.c33
1 files changed, 33 insertions, 0 deletions
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
new file mode 100644
index 000000000000..7afae88ed1d4
--- /dev/null
+++ b/arch/powerpc/lib/code-patching.c
@@ -0,0 +1,33 @@
1/*
2 * Copyright 2008 Michael Ellerman, IBM Corporation.
3 *
4 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU General Public License
6 * as published by the Free Software Foundation; either version
7 * 2 of the License, or (at your option) any later version.
8 */
9
10#include <linux/kernel.h>
11#include <asm/code-patching.h>
12
13
14void create_instruction(unsigned long addr, unsigned int instr)
15{
16 unsigned int *p;
17 p = (unsigned int *)addr;
18 *p = instr;
19 asm ("dcbst 0, %0; sync; icbi 0,%0; sync; isync" : : "r" (p));
20}
21
22void create_branch(unsigned long addr, unsigned long target, int flags)
23{
24 unsigned int instruction;
25
26 if (! (flags & BRANCH_ABSOLUTE))
27 target = target - addr;
28
29 /* Mask out the flags and target, so they don't step on each other. */
30 instruction = 0x48000000 | (flags & 0x3) | (target & 0x03FFFFFC);
31
32 create_instruction(addr, instruction);
33}