Module Name: src
Committed By: martin
Date: Tue Jan 28 08:09:19 UTC 2020
Modified Files:
src/sys/dev/fdt: fdtbus.c
Log Message:
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.31 -r1.32 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.31 src/sys/dev/fdt/fdtbus.c:1.32
--- src/sys/dev/fdt/fdtbus.c:1.31 Thu Jan 9 16:23:41 2020
+++ src/sys/dev/fdt/fdtbus.c Tue Jan 28 08:09:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.31 2020/01/09 16:23:41 martin Exp $ */
+/* $NetBSD: fdtbus.c,v 1.32 2020/01/28 08:09:19 martin Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.31 2020/01/09 16:23:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.32 2020/01/28 08:09:19 martin 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);