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