From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760303AbcCDVpF (ORCPT ); Fri, 4 Mar 2016 16:45:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49896 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758765AbcCDVpC (ORCPT ); Fri, 4 Mar 2016 16:45:02 -0500 Date: Fri, 4 Mar 2016 15:45:00 -0600 From: Josh Poimboeuf To: Miroslav Benes Cc: sjenning@redhat.com, vojtech@suse.com, jikos@kernel.org, pmladek@suse.cz, mpe@ellerman.id.au, live-patching@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] klp: remove superfluous errors in asm/livepatch.h Message-ID: <20160304214500.GA8104@treble.redhat.com> References: <1457085219-23653-1-git-send-email-mbenes@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1457085219-23653-1-git-send-email-mbenes@suse.cz> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 04, 2016 at 10:53:39AM +0100, Miroslav Benes wrote: > 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 Looks fine to me. While we're at it, do we even need the '#ifdef CONFIG_LIVEPATCH' in these files? And in include/linux/livepatch.h? > --- > 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 > -- Josh