[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20160114201532.GA3178@treble.redhat.com>
Date: Thu, 14 Jan 2016 14:15:32 -0600
From: Josh Poimboeuf <jpoimboe@...hat.com>
To: Miroslav Benes <mbenes@...e.cz>
Cc: sjenning@...hat.com, jikos@...nel.org, vojtech@...e.com,
pmladek@...e.cz, linux-kernel@...r.kernel.org,
live-patching@...r.kernel.org, akpm@...ux-foundation.org
Subject: Re: [PATCH] livepatch: change the error message in asm/livepatch.h
header files
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 <jpoimboe@...hat.com>
>
> Suggested-by: Andrew Morton <akpm@...ux-foundation.org>
> Signed-off-by: Miroslav Benes <mbenes@...e.cz>
> ---
> 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
>
Powered by blists - more mailing lists