* [PATCH] livepatch: change the error message in asm/livepatch.h header files
@ 2016-01-14 10:35 Miroslav Benes
2016-01-14 20:15 ` Josh Poimboeuf
2016-01-18 20:36 ` Jiri Kosina
0 siblings, 2 replies; 3+ messages in thread
From: Miroslav Benes @ 2016-01-14 10:35 UTC (permalink / raw)
To: jpoimboe, sjenning, jikos, vojtech
Cc: pmladek, linux-kernel, live-patching, akpm, Miroslav Benes
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 <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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] livepatch: change the error message in asm/livepatch.h header files
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
2016-01-18 20:36 ` Jiri Kosina
1 sibling, 0 replies; 3+ messages in thread
From: Josh Poimboeuf @ 2016-01-14 20:15 UTC (permalink / raw)
To: Miroslav Benes
Cc: sjenning, jikos, vojtech, pmladek, linux-kernel, live-patching,
akpm
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] livepatch: change the error message in asm/livepatch.h header files
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
@ 2016-01-18 20:36 ` Jiri Kosina
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Kosina @ 2016-01-18 20:36 UTC (permalink / raw)
To: Miroslav Benes
Cc: jpoimboe, sjenning, vojtech, pmladek, linux-kernel, live-patching,
akpm
On Thu, 14 Jan 2016, 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.
>
> Suggested-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Miroslav Benes <mbenes@suse.cz>
I've fixed the the wording in changelog and applied to
for-4.5/upstream-fixes, thanks.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-18 20:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2016-01-18 20:36 ` Jiri Kosina
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).