powerpc: Use a function for reading instructions
Prefixed instructions will mean there are instructions of different length. As a result dereferencing a pointer to an instruction will not necessarily give the desired result. Introduce a function for reading instructions from memory into the instruction data type. Signed-off-by: Jordan Niethe <jniethe5@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Reviewed-by: Alistair Popple <alistair@popple.id.au> Link: https://lore.kernel.org/r/20200506034050.24806-13-jniethe5@gmail.com
This commit is contained in:

committed by
Michael Ellerman

parent
94afd069d9
commit
f8faaffaa7
@@ -848,7 +848,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
|
||||
struct ppc_inst old, new;
|
||||
int ret;
|
||||
|
||||
old = *(struct ppc_inst *)&ftrace_call;
|
||||
old = ppc_inst_read((struct ppc_inst *)&ftrace_call);
|
||||
new = ftrace_call_replace(ip, (unsigned long)func, 1);
|
||||
ret = ftrace_modify_code(ip, old, new);
|
||||
|
||||
@@ -856,7 +856,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
|
||||
/* Also update the regs callback function */
|
||||
if (!ret) {
|
||||
ip = (unsigned long)(&ftrace_regs_call);
|
||||
old = *(struct ppc_inst *)&ftrace_regs_call;
|
||||
old = ppc_inst_read((struct ppc_inst *)&ftrace_regs_call);
|
||||
new = ftrace_call_replace(ip, (unsigned long)func, 1);
|
||||
ret = ftrace_modify_code(ip, old, new);
|
||||
}
|
||||
|
Reference in New Issue
Block a user