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

Commit 335e073f authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent b24b78a1

arch/s390/include/asm/livepatch.h

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include <linux/module.h>



#ifdef CONFIG_LIVEPATCH

static inline int klp_check_compiler_support(void)

{

	return 0;
@@ -36,6 +35,5 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) 
{

	regs->psw.addr = ip;

}

#endif



#endif

arch/x86/include/asm/livepatch.h

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

#include <linux/ftrace.h>



#ifdef CONFIG_LIVEPATCH

static inline int klp_check_compiler_support(void)

{

#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;

}

#endif



#endif /* _ASM_X86_LIVEPATCH_H */

include/linux/livepatch.h

+0 −4
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <linux/module.h>

#include <linux/ftrace.h>



#if IS_ENABLED(CONFIG_LIVEPATCH)



#include <asm/livepatch.h>



enum klp_state {
@@ -134,6 +132,4 @@ int klp_unregister_patch(struct klp_patch *); 
int klp_enable_patch(struct klp_patch *);

int klp_disable_patch(struct klp_patch *);



#endif /* CONFIG_LIVEPATCH */



#endif /* _LINUX_LIVEPATCH_H_ */