File tree 1 file changed +4
-4
lines changed
arch/powerpc/kernel/trace 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -392,11 +392,11 @@ int ftrace_make_nop(struct module *mod,
392
392
*/
393
393
static bool expected_nop_sequence (void * ip , ppc_inst_t op0 , ppc_inst_t op1 )
394
394
{
395
- if (IS_ENABLED (CONFIG_PPC64_ELF_ABI_V1 ))
395
+ if (IS_ENABLED (CONFIG_DYNAMIC_FTRACE_WITH_REGS ))
396
+ return ppc_inst_equal (op0 , ppc_inst (PPC_RAW_NOP ()));
397
+ else
396
398
return ppc_inst_equal (op0 , ppc_inst (PPC_RAW_BRANCH (8 ))) &&
397
399
ppc_inst_equal (op1 , ppc_inst (PPC_INST_LD_TOC ));
398
- else
399
- return ppc_inst_equal (op0 , ppc_inst (PPC_RAW_NOP ()));
400
400
}
401
401
402
402
static int
@@ -411,7 +411,7 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
411
411
if (copy_inst_from_kernel_nofault (op , ip ))
412
412
return - EFAULT ;
413
413
414
- if (IS_ENABLED (CONFIG_PPC64_ELF_ABI_V1 ) &&
414
+ if (! IS_ENABLED (CONFIG_DYNAMIC_FTRACE_WITH_REGS ) &&
415
415
copy_inst_from_kernel_nofault (op + 1 , ip + 4 ))
416
416
return - EFAULT ;
417
417
You can’t perform that action at this time.
0 commit comments