On Fri, Mar 04, 2016 at 10:53:39AM +0100, Miroslav Benes wrote:
> There is an #error in asm/livepatch.h for both x86 and s390 in
> !CONFIG_LIVEPATCH cases. It does not make much sense as pointed out by
> Michael Ellerman. One can happily include asm/livepatch.h with
> CONFIG_LIVEPATCH. Remove it as useless.
>
> Suggested-by: Michael Ellerman <m...@ellerman.id.au>
> Signed-off-by: Miroslav Benes <mbe...@suse.cz>
Looks fine to me. While we're at it, do we even need the '#ifdef
CONFIG_LIVEPATCH' in these files? And in include/linux/livepatch.h?
> ---
> arch/s390/include/asm/livepatch.h | 2 --
> arch/x86/include/asm/livepatch.h | 2 --
> 2 files changed, 4 deletions(-)
>
> diff --git a/arch/s390/include/asm/livepatch.h
> b/arch/s390/include/asm/livepatch.h
> index a52b6cca873d..105074582d86 100644
> --- a/arch/s390/include/asm/livepatch.h
> +++ b/arch/s390/include/asm/livepatch.h
> @@ -36,8 +36,6 @@ static inline void klp_arch_set_pc(struct pt_regs *regs,
> unsigned long ip)
> {
> regs->psw.addr = ip;
> }
> -#else
> -#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 e795f5274217..8acfe798625b 100644
> --- a/arch/x86/include/asm/livepatch.h
> +++ b/arch/x86/include/asm/livepatch.h
> @@ -40,8 +40,6 @@ static inline void klp_arch_set_pc(struct pt_regs *regs,
> unsigned long ip)
> {
> regs->ip = ip;
> }
> -#else
> -#error Include linux/livepatch.h, not asm/livepatch.h
> #endif
>
> #endif /* _ASM_X86_LIVEPATCH_H */
> --
> 2.7.2
>
--
Josh
