openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Josh Poimboeuf <jpoimboe@redhat.com>
Reviewed-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Josh Poimboeuf 2015-02-03 16:45:18 -06:00 committed by Jiri Kosina
parent dbed7ddab9
commit 12cf89b550
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/Kconfig
View File

@ -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

4
arch/x86/include/asm/livepatch.h
View File

@ -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 */

2
arch/x86/kernel/Makefile
View File

@ -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

4
include/linux/livepatch.h
View File

@ -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_ */

6
kernel/livepatch/Kconfig
View File

@ -1,15 +1,15 @@
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"

2
kernel/livepatch/Makefile
View File

@ -1,3 +1,3 @@
obj-$(CONFIG_LIVE_PATCHING) += livepatch.o
obj-$(CONFIG_LIVEPATCH) += livepatch.o
livepatch-objs := core.o

4
samples/Kconfig
View File

@ -63,9 +63,9 @@ config SAMPLE_RPMSG_CLIENT
to communicate with an AMP-configured remote processor over
the rpmsg bus.
config SAMPLE_LIVE_PATCHING
config SAMPLE_LIVEPATCH
tristate "Build live patching sample -- loadable modules only"
depends on LIVE_PATCHING && m
depends on LIVEPATCH && m
help
Builds a sample live patch that replaces the procfs handler
for /proc/cmdline to print "this has been live patched".

2
samples/livepatch/Makefile
View File

@ -1 +1 @@
obj-$(CONFIG_SAMPLE_LIVE_PATCHING) += livepatch-sample.o
obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-sample.o