diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-11-10 20:55:03 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-11-10 20:55:03 +1100 |
| commit | a54c61f46e25345e99eec06a402f746fe33febc6 (patch) | |
| tree | 23f59fe8702aaf90802cef6f25e76c15211747e1 /arch/powerpc/kernel/kprobes.c | |
| parent | 77fad8bfb1d2f8225b05e4ea34457875fcfae37e (diff) | |
| parent | 7ecb37f62fe58e3e4d9b03443b92d213b2c108ce (diff) | |
| download | linux-a54c61f46e25345e99eec06a402f746fe33febc6.tar.gz linux-a54c61f46e25345e99eec06a402f746fe33febc6.tar.bz2 linux-a54c61f46e25345e99eec06a402f746fe33febc6.zip | |
Merge branch 'fixes' into next
We have some dependencies & conflicts between patches in fixes and
things to go in next, both in the radix TLB flush code and the IMC PMU
driver. So merge fixes into next.
Diffstat (limited to 'arch/powerpc/kernel/kprobes.c')
| -rw-r--r-- | arch/powerpc/kernel/kprobes.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c index a14c61855705..a20ce12adab1 100644 --- a/arch/powerpc/kernel/kprobes.c +++ b/arch/powerpc/kernel/kprobes.c @@ -605,7 +605,12 @@ NOKPROBE_SYMBOL(kprobe_fault_handler); unsigned long arch_deref_entry_point(void *entry) { - return ppc_global_function_entry(entry); +#ifdef PPC64_ELF_ABI_v1 + if (!kernel_text_address((unsigned long)entry)) + return ppc_global_function_entry(entry); + else +#endif + return (unsigned long)entry; } NOKPROBE_SYMBOL(arch_deref_entry_point); |