Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12cf89b5 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Jiri Kosina
Browse files

livepatch: rename config to CONFIG_LIVEPATCH 



Rename CONFIG_LIVE_PATCHING to CONFIG_LIVEPATCH to make the naming of
the config and the code more consistent.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Reviewed-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent dbed7dda

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ config X86_64 
	depends on 64BIT

	select X86_DEV_DMA_OPS

	select ARCH_USE_CMPXCHG_LOCKREF

	select HAVE_LIVE_PATCHING

	select HAVE_LIVEPATCH



### Arch settings

config X86

arch/x86/include/asm/livepatch.h

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/module.h>

#include <linux/ftrace.h>



#ifdef CONFIG_LIVE_PATCHING

#ifdef CONFIG_LIVEPATCH

static inline int klp_check_compiler_support(void)

{

#ifndef CC_USING_FENTRY
@@ -40,7 +40,7 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) 
	regs->ip = ip;

}

#else

#error Live patching support is disabled; check CONFIG_LIVE_PATCHING

#error Live patching support is disabled; check CONFIG_LIVEPATCH

#endif



#endif /* _ASM_X86_LIVEPATCH_H */

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ obj-$(CONFIG_X86_MPPARSE) += mpparse.o 
obj-y				+= apic/

obj-$(CONFIG_X86_REBOOTFIXUPS)	+= reboot_fixups_32.o

obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o

obj-$(CONFIG_LIVE_PATCHING)	+= livepatch.o

obj-$(CONFIG_LIVEPATCH)		+= livepatch.o

obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o

obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o

obj-$(CONFIG_X86_TSC)		+= trace_clock.o

include/linux/livepatch.h

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/module.h>

#include <linux/ftrace.h>



#if IS_ENABLED(CONFIG_LIVE_PATCHING)

#if IS_ENABLED(CONFIG_LIVEPATCH)



#include <asm/livepatch.h>
@@ -128,6 +128,6 @@ extern int klp_unregister_patch(struct klp_patch *); 
extern int klp_enable_patch(struct klp_patch *);

extern int klp_disable_patch(struct klp_patch *);



#endif /* CONFIG_LIVE_PATCHING */

#endif /* CONFIG_LIVEPATCH */



#endif /* _LINUX_LIVEPATCH_H_ */

kernel/livepatch/Kconfig

+3 −3
Original line number Diff line number Diff line 
config HAVE_LIVE_PATCHING

config HAVE_LIVEPATCH

	bool

	help

	  Arch supports kernel live patching



config LIVE_PATCHING

config LIVEPATCH

	bool "Kernel Live Patching"

	depends on DYNAMIC_FTRACE_WITH_REGS

	depends on MODULES

	depends on SYSFS

	depends on KALLSYMS_ALL

	depends on HAVE_LIVE_PATCHING

	depends on HAVE_LIVEPATCH

	help

	  Say Y here if you want to support kernel live patching.

	  This option has no runtime impact until a kernel "patch"