lkl: hide dump_stack() if CONFIG_PRINTK is not set

retrage · retrage · commit 4674f04f3daa · 2019-10-04T16:37:10.000+09:00
include/linux/printk.h defines stub dump_stack() if CONFIG_PRINTK is not
set. This function conflicts with dump_stack() in
arch/lkl/kernel/misc.c. This commit resolves the issue by hiding lkl
specific dump_stack() if CONFIG_PRINTK is not set.

Signed-off-by: Akira Moroo &lt;retrage01@gmail.com&gt;
diff --git a/arch/lkl/kernel/misc.c b/arch/lkl/kernel/misc.c
@@ -5,6 +5,7 @@
 #include <asm/ptrace.h>
 #include <asm/host_ops.h>
 
+#ifdef CONFIG_PRINTK
 void dump_stack(void)
 {
 	unsigned long dummy;
@@ -23,6 +24,7 @@ void dump_stack(void)
 	}
 	pr_info("\n");
 }
+#endif
 
 void show_regs(struct pt_regs *regs)
 {

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#include <asm/ptrace.h>`
`6`	`6`	`#include <asm/host_ops.h>`
`7`	`7`
	`8`	`+#ifdef CONFIG_PRINTK`
`8`	`9`	`void dump_stack(void)`
`9`	`10`	`{`
`10`	`11`	`unsigned long dummy;`
`@@ -23,6 +24,7 @@ void dump_stack(void)`
`23`	`24`	`}`
`24`	`25`	`pr_info("\n");`
`25`	`26`	`}`
	`27`	`+#endif`
`26`	`28`
`27`	`29`	`void show_regs(struct pt_regs *regs)`
`28`	`30`	`{`