Module Name: src Committed By: msaitoh Date: Mon Sep 27 16:22:58 UTC 2021
Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: Add ':' for readability. To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/cpuctl/arch/i386.c diff -u src/usr.sbin/cpuctl/arch/i386.c:1.117 src/usr.sbin/cpuctl/arch/i386.c:1.118 --- src/usr.sbin/cpuctl/arch/i386.c:1.117 Mon Jul 12 12:56:52 2021 +++ src/usr.sbin/cpuctl/arch/i386.c Mon Sep 27 16:22:58 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: i386.c,v 1.117 2021/07/12 12:56:52 msaitoh Exp $ */ +/* $NetBSD: i386.c,v 1.118 2021/09/27 16:22:58 msaitoh Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: i386.c,v 1.117 2021/07/12 12:56:52 msaitoh Exp $"); +__RCSID("$NetBSD: i386.c,v 1.118 2021/09/27 16:22:58 msaitoh Exp $"); #endif /* not lint */ #include <sys/types.h> @@ -2456,18 +2456,18 @@ x86_print_cache_and_tlb_info(struct cpu_ if (ci->ci_cinfo[CAI_ICACHE].cai_totalsize != 0 || ci->ci_cinfo[CAI_DCACHE].cai_totalsize != 0) { - sep = print_cache_config(ci, CAI_ICACHE, "I-cache", NULL); - sep = print_cache_config(ci, CAI_DCACHE, "D-cache", sep); + sep = print_cache_config(ci, CAI_ICACHE, "I-cache:", NULL); + sep = print_cache_config(ci, CAI_DCACHE, "D-cache:", sep); if (sep != NULL) aprint_verbose("\n"); } if (ci->ci_cinfo[CAI_L2CACHE].cai_totalsize != 0) { - sep = print_cache_config(ci, CAI_L2CACHE, "L2 cache", NULL); + sep = print_cache_config(ci, CAI_L2CACHE, "L2 cache:", NULL); if (sep != NULL) aprint_verbose("\n"); } if (ci->ci_cinfo[CAI_L3CACHE].cai_totalsize != 0) { - sep = print_cache_config(ci, CAI_L3CACHE, "L3 cache", NULL); + sep = print_cache_config(ci, CAI_L3CACHE, "L3 cache:", NULL); if (sep != NULL) aprint_verbose("\n"); } @@ -2478,56 +2478,56 @@ x86_print_cache_and_tlb_info(struct cpu_ aprint_verbose("\n"); } if (ci->ci_cinfo[CAI_ITLB].cai_totalsize != 0) { - sep = print_tlb_config(ci, CAI_ITLB, "ITLB", NULL); + sep = print_tlb_config(ci, CAI_ITLB, "ITLB:", NULL); sep = print_tlb_config(ci, CAI_ITLB2, NULL, sep); if (sep != NULL) aprint_verbose("\n"); } if (ci->ci_cinfo[CAI_DTLB].cai_totalsize != 0) { - sep = print_tlb_config(ci, CAI_DTLB, "DTLB", NULL); + sep = print_tlb_config(ci, CAI_DTLB, "DTLB:", NULL); sep = print_tlb_config(ci, CAI_DTLB2, NULL, sep); if (sep != NULL) aprint_verbose("\n"); } if (ci->ci_cinfo[CAI_L2_ITLB].cai_totalsize != 0) { - sep = print_tlb_config(ci, CAI_L2_ITLB, "L2 ITLB", NULL); + sep = print_tlb_config(ci, CAI_L2_ITLB, "L2 ITLB:", NULL); sep = print_tlb_config(ci, CAI_L2_ITLB2, NULL, sep); if (sep != NULL) aprint_verbose("\n"); } if (ci->ci_cinfo[CAI_L2_DTLB].cai_totalsize != 0) { - sep = print_tlb_config(ci, CAI_L2_DTLB, "L2 DTLB", NULL); + sep = print_tlb_config(ci, CAI_L2_DTLB, "L2 DTLB:", NULL); sep = print_tlb_config(ci, CAI_L2_DTLB2, NULL, sep); if (sep != NULL) aprint_verbose("\n"); } if (ci->ci_cinfo[CAI_L2_STLB].cai_totalsize != 0) { - sep = print_tlb_config(ci, CAI_L2_STLB, "L2 STLB", NULL); + sep = print_tlb_config(ci, CAI_L2_STLB, "L2 STLB:", NULL); sep = print_tlb_config(ci, CAI_L2_STLB2, NULL, sep); sep = print_tlb_config(ci, CAI_L2_STLB3, NULL, sep); if (sep != NULL) aprint_verbose("\n"); } if (ci->ci_cinfo[CAI_L1_1GBITLB].cai_totalsize != 0) { - sep = print_tlb_config(ci, CAI_L1_1GBITLB, "L1 1GB page ITLB", + sep = print_tlb_config(ci, CAI_L1_1GBITLB, "L1 1GB page ITLB:", NULL); if (sep != NULL) aprint_verbose("\n"); } if (ci->ci_cinfo[CAI_L1_1GBDTLB].cai_totalsize != 0) { - sep = print_tlb_config(ci, CAI_L1_1GBDTLB, "L1 1GB page DTLB", + sep = print_tlb_config(ci, CAI_L1_1GBDTLB, "L1 1GB page DTLB:", NULL); if (sep != NULL) aprint_verbose("\n"); } if (ci->ci_cinfo[CAI_L2_1GBITLB].cai_totalsize != 0) { - sep = print_tlb_config(ci, CAI_L2_1GBITLB, "L2 1GB page ITLB", + sep = print_tlb_config(ci, CAI_L2_1GBITLB, "L2 1GB page ITLB:", NULL); if (sep != NULL) aprint_verbose("\n"); } if (ci->ci_cinfo[CAI_L2_1GBDTLB].cai_totalsize != 0) { - sep = print_tlb_config(ci, CAI_L2_1GBDTLB, "L2 1GB page DTLB", + sep = print_tlb_config(ci, CAI_L2_1GBDTLB, "L2 1GB page DTLB:", NULL); if (sep != NULL) aprint_verbose("\n");