From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759439AbcCDJxs (ORCPT ); Fri, 4 Mar 2016 04:53:48 -0500 Received: from mx2.suse.de ([195.135.220.15]:37750 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759074AbcCDJxn (ORCPT ); Fri, 4 Mar 2016 04:53:43 -0500 From: Miroslav Benes To: jpoimboe@redhat.com, sjenning@redhat.com, vojtech@suse.com, jikos@kernel.org Cc: pmladek@suse.cz, mpe@ellerman.id.au, live-patching@vger.kernel.org, linux-kernel@vger.kernel.org, Miroslav Benes Subject: [PATCH] klp: remove superfluous errors in asm/livepatch.h Date: Fri, 4 Mar 2016 10:53:39 +0100 Message-Id: <1457085219-23653-1-git-send-email-mbenes@suse.cz> X-Mailer: git-send-email 2.7.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Miroslav Benes --- 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