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

mirab · Jiri Kosina · commit 383bf44d1a8b · 2016-01-18T21:35:43.000+01:00
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 &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Miroslav Benes &lt;mbenes@suse.cz&gt;
Acked-by: Josh Poimboeuf &lt;jpoimboe@redhat.com&gt;
Signed-off-by: Jiri Kosina &lt;jkosina@suse.cz&gt;
diff --git 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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)`
`37`	`37`	`regs->psw.addr = ip;`
`38`	`38`	`}`
`39`	`39`	`#else`
`40`		`-#error Live patching support is disabled; check CONFIG_LIVEPATCH`
	`40`	`+#error Include linux/livepatch.h, not asm/livepatch.h`
`41`	`41`	`#endif`
`42`	`42`
`43`	`43`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)`
`41`	`41`	`regs->ip = ip;`
`42`	`42`	`}`
`43`	`43`	`#else`
`44`		`-#error Live patching support is disabled; check CONFIG_LIVEPATCH`
	`44`	`+#error Include linux/livepatch.h, not asm/livepatch.h`
`45`	`45`	`#endif`
`46`	`46`
`47`	`47`	`#endif /* _ASM_X86_LIVEPATCH_H */`