diff options
| author | Miroslav Benes <mbenes@suse.cz> | 2016-01-14 05:35:53 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-01-18 15:35:43 -0500 |
| commit | 383bf44d1a8b18de5c26ec2a48c6822681b50984 (patch) | |
| tree | 45308e6eb8139047d30baca252b32c81525724e3 /arch/x86/include/asm/livepatch.h | |
| parent | 0f0836b7eb1b9d14862ee40c7856227a3ead70db (diff) | |
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: 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>
Diffstat (limited to 'arch/x86/include/asm/livepatch.h')
| -rw-r--r-- | arch/x86/include/asm/livepatch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h index 19c099afa861..e795f5274217 100644 --- a/arch/x86/include/asm/livepatch.h +++ b/arch/x86/include/asm/livepatch.h | |||
| @@ -41,7 +41,7 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) | |||
| 41 | regs->ip = ip; | 41 | regs->ip = ip; |
| 42 | } | 42 | } |
| 43 | #else | 43 | #else |
| 44 | #error Live patching support is disabled; check CONFIG_LIVEPATCH | 44 | #error Include linux/livepatch.h, not asm/livepatch.h |
| 45 | #endif | 45 | #endif |
| 46 | 46 | ||
| 47 | #endif /* _ASM_X86_LIVEPATCH_H */ | 47 | #endif /* _ASM_X86_LIVEPATCH_H */ |