korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-16 15:34:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

livepatch: change the error message in asm/livepatch.h header files

Browse Source 
If anyone includes asm/livepatch.h when CONFIG_LIVEPATCH=n the build
fails with the existing error message. Change it to something saner.

[jkosina@suse.cz: fixed changelog typo spotted by Josh]
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Miroslav Benes <mbenes@suse.cz>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Miroslav Benes 2016-01-14 11:35:53 +01:00 committed by Jiri Kosina
parent 0f0836b7eb
commit 383bf44d1a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/include/asm/livepatch.h
View File

@ -37,7 +37,7 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
regs->psw.addr = ip; regs->psw.addr = ip;
} }
#else #else
#error Live patching support is disabled; check CONFIG_LIVEPATCH #error Include linux/livepatch.h, not asm/livepatch.h
#endif #endif
#endif #endif

2
arch/x86/include/asm/livepatch.h
View File

@ -41,7 +41,7 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
regs->ip = ip; regs->ip = ip;
} }
#else #else
#error Live patching support is disabled; check CONFIG_LIVEPATCH #error Include linux/livepatch.h, not asm/livepatch.h
#endif #endif
#endif /* _ASM_X86_LIVEPATCH_H */ #endif /* _ASM_X86_LIVEPATCH_H */