linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Miroslav Benes <mbenes@suse.cz>
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
Date: Thu, 14 Jan 2016 14:15:32 -0600	[thread overview]
Message-ID: <20160114201532.GA3178@treble.redhat.com> (raw)
In-Reply-To: <1452767753-26622-1-git-send-email-mbenes@suse.cz>

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@redhat.com>

> 
> Suggested-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Miroslav Benes <mbenes@suse.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
> 

  reply	other threads:[~2016-01-14 20:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-14 10:35 [PATCH] livepatch: change the error message in asm/livepatch.h header files Miroslav Benes
2016-01-14 20:15 ` Josh Poimboeuf [this message]
2016-01-18 20:36 ` Jiri Kosina

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160114201532.GA3178@treble.redhat.com \
    --to=jpoimboe@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=jikos@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=live-patching@vger.kernel.org \
    --cc=mbenes@suse.cz \
    --cc=pmladek@suse.cz \
    --cc=sjenning@redhat.com \
    --cc=vojtech@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).