[src/netbsd-9]: src/sys/dev/fdt Pull up following revision(s) (requested by m...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b91b3a4d4327
branches:  netbsd-9
changeset: 744248:b91b3a4d4327
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Jan 28 09:06:37 2020 +0000

description:
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.

diffstat:

 sys/dev/fdt/fdtbus.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 74e1cfc65a83 -r b91b3a4d4327 sys/dev/fdt/fdtbus.c
--- a/sys/dev/fdt/fdtbus.c      Mon Jan 27 07:29:56 2020 +0000
+++ b/sys/dev/fdt/fdtbus.c      Tue Jan 28 09:06:37 2020 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
        /* 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);