diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2022-03-07 23:34:32 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-03-07 23:34:32 +1100 |
| commit | 4bc06c59f62d3d376294f92cf808fc889b3ff431 (patch) | |
| tree | c5b177975b0f7da164e63f0188665d6d245ff073 /arch/powerpc/include/asm/code-patching.h | |
| parent | 8219d31effa7be5dbc7ff915d7970672e028c701 (diff) | |
| parent | 5e5a6c5441654d1b9e576ce4ca8a1759e701079e (diff) | |
| download | lwn-4bc06c59f62d3d376294f92cf808fc889b3ff431.tar.gz lwn-4bc06c59f62d3d376294f92cf808fc889b3ff431.zip | |
Merge branch 'topic/func-desc-lkdtm' into next
Merge a topic branch we are maintaining with some cross-architecture
changes to function descriptor handling and their use in LKDTM.
From Christophe's cover letter:
Fix LKDTM for PPC64/IA64/PARISC
PPC64/IA64/PARISC have function descriptors. LKDTM doesn't work on those
three architectures because LKDTM messes up function descriptors with
functions.
This series does some cleanup in the three architectures and refactors
function descriptors so that it can then easily use it in a generic way
in LKDTM.
Diffstat (limited to 'arch/powerpc/include/asm/code-patching.h')
| -rw-r--r-- | arch/powerpc/include/asm/code-patching.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/code-patching.h b/arch/powerpc/include/asm/code-patching.h index e26080539c31..409483b2d0ce 100644 --- a/arch/powerpc/include/asm/code-patching.h +++ b/arch/powerpc/include/asm/code-patching.h @@ -118,7 +118,7 @@ static inline unsigned long ppc_function_entry(void *func) * function's descriptor. The first entry in the descriptor is the * address of the function text. */ - return ((func_descr_t *)func)->entry; + return ((struct func_desc *)func)->addr; #else return (unsigned long)func; #endif |