diff options
| author | Miroslav Benes <mbenes@suse.cz> | 2016-03-04 10:53:39 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-03-06 22:19:26 +0100 |
| commit | b24b78a113164a84bf242b08ef2165365445ea2b (patch) | |
| tree | eec3b2386be6650ab433c0c4cdbc21471285089e /arch/x86/include/asm/livepatch.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| download | linux-b24b78a113164a84bf242b08ef2165365445ea2b.tar.xz linux-b24b78a113164a84bf242b08ef2165365445ea2b.zip | |
klp: remove superfluous errors in asm/livepatch.h
There is an #error in asm/livepatch.h for both x86 and s390 in
!CONFIG_LIVEPATCH cases. It does not make much sense as pointed out by
Michael Ellerman. One can happily include asm/livepatch.h with
CONFIG_LIVEPATCH. Remove it as useless.
Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
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, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h index e795f5274217..8acfe798625b 100644 --- a/arch/x86/include/asm/livepatch.h +++ b/arch/x86/include/asm/livepatch.h @@ -40,8 +40,6 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) { regs->ip = ip; } -#else -#error Include linux/livepatch.h, not asm/livepatch.h #endif #endif /* _ASM_X86_LIVEPATCH_H */ |