Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1350103

[PATCH] klp: remove superfluous errors in asm/livepatch.h

Show all headers | View raw

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>
---
 arch/s390/include/asm/livepatch.h | 2 --
 arch/x86/include/asm/livepatch.h  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/arch/s390/include/asm/livepatch.h b/arch/s390/include/asm/livepatch.h
index a52b6cca873d..105074582d86 100644
--- a/arch/s390/include/asm/livepatch.h
+++ b/arch/s390/include/asm/livepatch.h
@@ -36,8 +36,6 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
 {
 	regs->psw.addr = ip;
 }
-#else
-#error Include linux/livepatch.h, not asm/livepatch.h
 #endif
 
 #endif
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 */
-- 
2.7.2

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] klp: remove superfluous errors in asm/livepatch.h Miroslav Benes <mbenes@suse.cz> - 2016-03-04 11:00 +0100
  Re: [PATCH] klp: remove superfluous errors in asm/livepatch.h Josh Poimboeuf <jpoimboe@redhat.com> - 2016-03-04 22:50 +0100
    Re: [PATCH] klp: remove superfluous errors in asm/livepatch.h Jiri Kosina <jikos@kernel.org> - 2016-03-06 22:20 +0100
      Re: [PATCH] klp: remove superfluous errors in asm/livepatch.h Josh Poimboeuf <jpoimboe@redhat.com> - 2016-03-07 05:20 +0100
      Re: klp: remove superfluous errors in asm/livepatch.h Jessica Yu <jeyu@redhat.com> - 2016-03-08 22:30 +0100
        Re: klp: remove superfluous errors in asm/livepatch.h Petr Mladek <pmladek@suse.com> - 2016-03-09 11:10 +0100
        Re: klp: remove superfluous errors in asm/livepatch.h Jiri Kosina <jikos@kernel.org> - 2016-03-09 11:40 +0100
          Re: klp: remove superfluous errors in asm/livepatch.h Josh Poimboeuf <jpoimboe@redhat.com> - 2016-03-09 17:20 +0100
    Re: [PATCH] klp: remove superfluous errors in asm/livepatch.h Miroslav Benes <mbenes@suse.cz> - 2016-03-15 12:40 +0100

csiph-web