From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753811AbcANKgE (ORCPT ); Thu, 14 Jan 2016 05:36:04 -0500 Received: from mx2.suse.de ([195.135.220.15]:38823 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753435AbcANKgB (ORCPT ); Thu, 14 Jan 2016 05:36:01 -0500 From: Miroslav Benes To: jpoimboe@redhat.com, sjenning@redhat.com, jikos@kernel.org, vojtech@suse.com Cc: pmladek@suse.cz, linux-kernel@vger.kernel.org, live-patching@vger.kernel.org, akpm@linux-foundation.org, Miroslav Benes Subject: [PATCH] livepatch: change the error message in asm/livepatch.h header files Date: Thu, 14 Jan 2016 11:35:53 +0100 Message-Id: <1452767753-26622-1-git-send-email-mbenes@suse.cz> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If anyone includes asm/livepatch.h when CONFIG_LIVEPATCH=n the build fails with the existing error message. Change to it to something saner. 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