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

Commit 383bf44d authored by Miroslav Benes's avatar Miroslav Benes Committed by Jiri Kosina
Browse files

livepatch: change the error message in asm/livepatch.h header files 



If anyone includes asm/livepatch.h when CONFIG_LIVEPATCH=n the build
fails with the existing error message. Change it to something saner.

[jkosina@suse.cz: fixed changelog typo spotted by Josh]
Suggested-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMiroslav Benes <mbenes@suse.cz>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 0f0836b7

arch/s390/include/asm/livepatch.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) 
	regs->psw.addr = ip;

}

#else

#error Live patching support is disabled; check CONFIG_LIVEPATCH

#error Include linux/livepatch.h, not asm/livepatch.h

#endif



#endif

arch/x86/include/asm/livepatch.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,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_LIVEPATCH

#error Include linux/livepatch.h, not asm/livepatch.h

#endif



#endif /* _ASM_X86_LIVEPATCH_H */