From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754274AbcANUPg (ORCPT ); Thu, 14 Jan 2016 15:15:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43993 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753167AbcANUPe (ORCPT ); Thu, 14 Jan 2016 15:15:34 -0500 Date: Thu, 14 Jan 2016 14:15:32 -0600 From: Josh Poimboeuf To: Miroslav Benes Cc: sjenning@redhat.com, jikos@kernel.org, vojtech@suse.com, pmladek@suse.cz, linux-kernel@vger.kernel.org, live-patching@vger.kernel.org, akpm@linux-foundation.org Subject: Re: [PATCH] livepatch: change the error message in asm/livepatch.h header files Message-ID: <20160114201532.GA3178@treble.redhat.com> References: <1452767753-26622-1-git-send-email-mbenes@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1452767753-26622-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 Thu, Jan 14, 2016 at 11:35:53AM +0100, Miroslav Benes wrote: > If anyone includes asm/livepatch.h when CONFIG_LIVEPATCH=n the build > fails with the existing error message. Change to it to something saner. s/Change to it/Change it/ Otherwise, Acked-by: Josh Poimboeuf > > Suggested-by: Andrew Morton > Signed-off-by: Miroslav Benes > --- > arch/s390/include/asm/livepatch.h | 2 +- > arch/x86/include/asm/livepatch.h | 2 +- > 2 files changed, 2 insertions(+), 2 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 > diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h > index 19c099afa861..e795f5274217 100644 > --- a/arch/x86/include/asm/livepatch.h > +++ b/arch/x86/include/asm/livepatch.h > @@ -41,7 +41,7 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) > regs->ip = ip; > } > #else > -#error Live patching support is disabled; check CONFIG_LIVEPATCH > +#error Include linux/livepatch.h, not asm/livepatch.h > #endif > > #endif /* _ASM_X86_LIVEPATCH_H */ > -- > 2.1.4 >