Skip to content

Commit

Permalink
livepatch: change the error message in asm/livepatch.h header files
Browse files Browse the repository at this point in the history
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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Miroslav Benes <mbenes@suse.cz>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Miroslav Benes authored and Jiri Kosina committed Jan 18, 2016
1 parent 0f0836b commit 383bf44
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/s390/include/asm/livepatch.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion arch/x86/include/asm/livepatch.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 383bf44

Please sign in to comment.