CVS commit: [netbsd-9] src/sys/dev/fdt

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Tue Jan 28 09:06:37 UTC 2020

Modified Files:
        src/sys/dev/fdt [netbsd-9]: fdtbus.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #665):
        sys/dev/fdt/fdtbus.c: revision 1.32
First arg of cpu_setmodel needs to be a format string - fix the llvm build.
>From maxv.


To generate a diff of this commit:
cvs rdiff -u -r1.29.2.2 -r1.29.2.3 src/sys/dev/fdt/fdtbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/fdt/fdtbus.c
diff -u src/sys/dev/fdt/fdtbus.c:1.29.2.2 src/sys/dev/fdt/fdtbus.c:1.29.2.3
--- src/sys/dev/fdt/fdtbus.c:1.29.2.2	Thu Jan  9 17:16:47 2020
+++ src/sys/dev/fdt/fdtbus.c	Tue Jan 28 09:06:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.29.2.2 2020/01/09 17:16:47 snj Exp $ */
+/* $NetBSD: fdtbus.c,v 1.29.2.3 2020/01/28 09:06:37 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.29.2.2 2020/01/09 17:16:47 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.29.2.3 2020/01/28 09:06:37 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -145,9 +145,9 @@ fdt_attach(device_t parent, device_t sel
 	/* Set hw.model if available */
 	model = fdtbus_get_string(phandle, "compatible");
 	if (model)
-		cpu_setmodel(model);
+		cpu_setmodel("%s", model);
 	else if (descr)
-		cpu_setmodel(descr);
+		cpu_setmodel("%s", descr);
 
 	/* Scan devices */
 	fdt_rescan(self, NULL, NULL);