Merge pull request torvalds#474 from retrage/v5.3-fixes

Suppress gcc warnings
upa · Oct 4, 2019 · 06ca3dd · 06ca3dd
2 parents 0a25540 + fd54f45
commit 06ca3dd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/arch/lkl/include/asm/Kbuild b/arch/lkl/include/asm/Kbuild
@@ -40,7 +40,6 @@ generic-y += mmu.h
 generic-y += mmu_context.h
 generic-y += module.h
 generic-y += msgbuf.h
-generic-y += page.h
 generic-y += param.h
 generic-y += parport.h
 generic-y += pci.h

diff --git a/arch/lkl/include/uapi/asm/unistd.h b/arch/lkl/include/uapi/asm/unistd.h
@@ -6,6 +6,8 @@
 #define __ARCH_WANT_SET_GET_RLIMIT
 #define __ARCH_WANT_TIME32_SYSCALLS
 
+#include <asm/bitsperlong.h>
+
 #if __BITS_PER_LONG == 64
 #define __ARCH_WANT_SYS_NEWFSTATAT
 #endif

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;
@@ -15,13 +16,15 @@ void dump_stack(void)
 	while (((long)stack & (THREAD_SIZE - 1)) != 0) {
 		addr = *stack;
 		if (__kernel_text_address(addr)) {
-			pr_info("%p:  [<%08lx>] %pS", stack, addr, addr);
+			pr_info("%p:  [<%08lx>] %pS", stack, addr,
+				(void *)addr);
 			pr_cont("\n");
 		}
 		stack++;
 	}
 	pr_info("\n");
 }
+#endif
 
 void show_regs(struct pt_regs *regs)
 {

diff --git a/arch/lkl/kernel/setup.c b/arch/lkl/kernel/setup.c
@@ -61,7 +61,7 @@ int __init lkl_start_kernel(struct lkl_host_operations *ops,
 	va_end(ap);
 
 	if (ops->virtio_devices)
-		strncpy(boot_command_line + ret, ops->virtio_devices,
+		strscpy(boot_command_line + ret, ops->virtio_devices,
 			COMMAND_LINE_SIZE - ret);
 
 	memcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE);

diff --git a/tools/lkl/lib/config.c b/tools/lkl/lib/config.c
@@ -1,6 +1,11 @@
 #include <stdlib.h>
 #define _HAVE_STRING_ARCH_strtok_r
 #include <string.h>
+#ifndef __MINGW32__
+#include <arpa/inet.h>
+#else
+#define inet_pton lkl_inet_pton
+#endif
 #include <lkl_host.h>
 #include <lkl_config.h>