diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-11-10 12:55:03 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-11-10 12:55:03 +0300 |
| commit | a54c61f46e25345e99eec06a402f746fe33febc6 (patch) | |
| tree | 23f59fe8702aaf90802cef6f25e76c15211747e1 /arch/powerpc/include | |
| parent | 77fad8bfb1d2f8225b05e4ea34457875fcfae37e (diff) | |
| parent | 7ecb37f62fe58e3e4d9b03443b92d213b2c108ce (diff) | |
| download | linux-a54c61f46e25345e99eec06a402f746fe33febc6.tar.xz | |
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/include')
| -rw-r--r-- | arch/powerpc/include/asm/code-patching.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/powerpc/include/asm/code-patching.h b/arch/powerpc/include/asm/code-patching.h index 5482928eea1b..abef812de7f8 100644 --- a/arch/powerpc/include/asm/code-patching.h +++ b/arch/powerpc/include/asm/code-patching.h @@ -83,16 +83,8 @@ static inline unsigned long ppc_function_entry(void *func) * On PPC64 ABIv1 the function pointer actually points to the * function's descriptor. The first entry in the descriptor is the * address of the function text. - * - * However, we may also receive pointer to an assembly symbol. To - * detect that, we first check if the function pointer we receive - * already points to kernel/module text and we only dereference it - * if it doesn't. */ - if (kernel_text_address((unsigned long)func)) - return (unsigned long)func; - else - return ((func_descr_t *)func)->entry; + return ((func_descr_t *)func)->entry; #else return (unsigned long)func; #endif |