diff options
| author |   Miroslav Benes <mbenes@suse.cz> | 2016-01-14 11:35:53 +0100 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2016-01-18 21:35:43 +0100 |
| commit | 383bf44d1a8b18de5c26ec2a48c6822681b50984 (patch) | |
| tree | 45308e6eb8139047d30baca252b32c81525724e3 /arch/s390 | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching (diff) | |
| download | linux-dev-383bf44d1a8b18de5c26ec2a48c6822681b50984.tar.xz linux-dev-383bf44d1a8b18de5c26ec2a48c6822681b50984.zip | |
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/s390')
| -rw-r--r-- | arch/s390/include/asm/livepatch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/livepatch.h b/arch/s390/include/asm/livepatch.h index 7aa799134a11..a52b6cca873d 100644 --- a/arch/s390/include/asm/livepatch.h +++ b/arch/s390/include/asm/livepatch.h @@ -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 |