klp: remove CONFIG_LIVEPATCH dependency from klp headers
There is no need for livepatch.h (generic and arch-specific) to depend on CONFIG_LIVEPATCH. Remove that superfluous dependency. Reported-by: Josh Poimboeuf <jpoimboe@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Родитель
b24b78a113
Коммит
335e073faa
|
@ -19,7 +19,6 @@
|
||||||
|
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
|
|
||||||
#ifdef CONFIG_LIVEPATCH
|
|
||||||
static inline int klp_check_compiler_support(void)
|
static inline int klp_check_compiler_support(void)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -36,6 +35,5 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
|
||||||
{
|
{
|
||||||
regs->psw.addr = ip;
|
regs->psw.addr = ip;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/ftrace.h>
|
#include <linux/ftrace.h>
|
||||||
|
|
||||||
#ifdef CONFIG_LIVEPATCH
|
|
||||||
static inline int klp_check_compiler_support(void)
|
static inline int klp_check_compiler_support(void)
|
||||||
{
|
{
|
||||||
#ifndef CC_USING_FENTRY
|
#ifndef CC_USING_FENTRY
|
||||||
|
@ -40,6 +39,5 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
|
||||||
{
|
{
|
||||||
regs->ip = ip;
|
regs->ip = ip;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _ASM_X86_LIVEPATCH_H */
|
#endif /* _ASM_X86_LIVEPATCH_H */
|
||||||
|
|
|
@ -24,8 +24,6 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/ftrace.h>
|
#include <linux/ftrace.h>
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_LIVEPATCH)
|
|
||||||
|
|
||||||
#include <asm/livepatch.h>
|
#include <asm/livepatch.h>
|
||||||
|
|
||||||
enum klp_state {
|
enum klp_state {
|
||||||
|
@ -134,6 +132,4 @@ int klp_unregister_patch(struct klp_patch *);
|
||||||
int klp_enable_patch(struct klp_patch *);
|
int klp_enable_patch(struct klp_patch *);
|
||||||
int klp_disable_patch(struct klp_patch *);
|
int klp_disable_patch(struct klp_patch *);
|
||||||
|
|
||||||
#endif /* CONFIG_LIVEPATCH */
|
|
||||||
|
|
||||||
#endif /* _LINUX_LIVEPATCH_H_ */
|
#endif /* _LINUX_LIVEPATCH_H_ */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче