Re: [PATCH] livepatch: change the error message in asm/livepatch.h header files

[Josh Poimboeuf]

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@xxxxxxxxxx>

> 
> Suggested-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Miroslav Benes <mbenes@xxxxxxx>
> ---
>  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
>