diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-02 08:55:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-02 08:55:01 -0700 |
commit | 7c9e960c636306f632ccae623bf94b2b53d35cbd (patch) | |
tree | 5c1ed6ca4a3224e406319ae28cf9a5bc7d0a9a59 /arch/powerpc/kernel/setup_64.c | |
parent | Merge tag 'printk-for-5.19-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux (diff) | |
parent | livepatch: Remove klp_arch_set_pc() and asm/livepatch.h (diff) | |
download | linux-dev-7c9e960c636306f632ccae623bf94b2b53d35cbd.tar.xz linux-dev-7c9e960c636306f632ccae623bf94b2b53d35cbd.zip |
Merge tag 'livepatching-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Pull livepatching cleanup from Petr Mladek:
- Remove duplicated livepatch code [Christophe]
* tag 'livepatching-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
livepatch: Remove klp_arch_set_pc() and asm/livepatch.h
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 0e8fc1cd1c55..5761f08dae95 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -60,7 +60,7 @@ #include <asm/udbg.h> #include <asm/kexec.h> #include <asm/code-patching.h> -#include <asm/livepatch.h> +#include <asm/ftrace.h> #include <asm/opal.h> #include <asm/cputhreads.h> #include <asm/hw_irq.h> |