CVS commit: src/sys/arch/aarch64

[Ryo Shimizu]

Module Name:    src
Committed By:   ryo
Date:           Thu Oct  1 06:40:16 UTC 2020

Modified Files:
        src/sys/arch/aarch64/aarch64: procfs_machdep.c
        src/sys/arch/aarch64/include: cpu.h

Log Message:
fix build error with LLVM


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/aarch64/procfs_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/aarch64/include/cpu.h

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


Modified files:

Index: src/sys/arch/aarch64/aarch64/procfs_machdep.c
diff -u src/sys/arch/aarch64/aarch64/procfs_machdep.c:1.2 src/sys/arch/aarch64/aarch64/procfs_machdep.c:1.3
--- src/sys/arch/aarch64/aarch64/procfs_machdep.c:1.2	Wed Sep 30 08:43:47 2020
+++ src/sys/arch/aarch64/aarch64/procfs_machdep.c	Thu Oct  1 06:40:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_machdep.c,v 1.2 2020/09/30 08:43:47 ryo Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.3 2020/10/01 06:40:16 ryo Exp $ */
 
 /*-
  * Copyright (c) 2020 Ryo Shimizu <r...@nerv.org>
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.2 2020/09/30 08:43:47 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.3 2020/10/01 06:40:16 ryo Exp $");
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
 #include <miscfs/procfs/procfs.h>
 #include <aarch64/armreg.h>
 
@@ -188,7 +190,7 @@ procfs_getcpuinfstr(char *buf, size_t *l
 	total = 0;
 
 	for (CPU_INFO_FOREACH(cii, ci)) {
-		OUTPUT_BUF("processor\t: %lu\n", cii);
+		OUTPUT_BUF("processor\t: %d\n", cii);
 
 		len = procfs_cpuinfo_features(ci, buf, left);
 		FORWARD_BUF(len);

Index: src/sys/arch/aarch64/include/cpu.h
diff -u src/sys/arch/aarch64/include/cpu.h:1.27 src/sys/arch/aarch64/include/cpu.h:1.28
--- src/sys/arch/aarch64/include/cpu.h:1.27	Mon Sep 14 10:06:35 2020
+++ src/sys/arch/aarch64/include/cpu.h	Thu Oct  1 06:40:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.27 2020/09/14 10:06:35 ryo Exp $ */
+/* $NetBSD: cpu.h,v 1.28 2020/10/01 06:40:16 ryo Exp $ */
 
 /*-
  * Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@ void	cpu_hatch(struct cpu_info *);
 extern struct cpu_info *cpu_info[];
 extern struct cpu_info cpu_info_store[];
 
-#define CPU_INFO_ITERATOR	cpuid_t
+#define CPU_INFO_ITERATOR	int
 #if defined(MULTIPROCESSOR) || defined(_MODULE)
 #define cpu_number()		(curcpu()->ci_index)
 #define CPU_IS_PRIMARY(ci)	((ci)->ci_index == 0)