diff options
| author | Michael Ellerman | 2016-04-18 12:45:32 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2016-04-18 12:45:32 +0200 |
| commit | 8404410b296095c78ed63f163ac5d417ff0647dd (patch) | |
| tree | 542fcea7d106a8fd608c47da1a8c88255f3e2c5f /arch/powerpc/kernel/asm-offsets.c | |
| parent | cxl: Delete an unnecessary check before the function call "kfree" (diff) | |
| parent | powerpc/livepatch: Add live patching support on ppc64le (diff) | |
| download | kernel-qcow2-linux-8404410b296095c78ed63f163ac5d417ff0647dd.tar.gz kernel-qcow2-linux-8404410b296095c78ed63f163ac5d417ff0647dd.tar.xz kernel-qcow2-linux-8404410b296095c78ed63f163ac5d417ff0647dd.zip | |
Merge branch 'topic/livepatch' into next
Merge the support for live patching on ppc64le using mprofile-kernel.
This branch has also been merged into the livepatching tree for v4.7.
Diffstat (limited to 'arch/powerpc/kernel/asm-offsets.c')
| -rw-r--r-- | arch/powerpc/kernel/asm-offsets.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 0d0183d3180a..c9370d4e36bd 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -86,6 +86,10 @@ int main(void) DEFINE(KSP_LIMIT, offsetof(struct thread_struct, ksp_limit)); #endif /* CONFIG_PPC64 */ +#ifdef CONFIG_LIVEPATCH + DEFINE(TI_livepatch_sp, offsetof(struct thread_info, livepatch_sp)); +#endif + DEFINE(KSP, offsetof(struct thread_struct, ksp)); DEFINE(PT_REGS, offsetof(struct thread_struct, regs)); #ifdef CONFIG_BOOKE |