From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Tue, 12 May 2015 22:58:54 +0000 (-0700)
Subject: kernel - Improve cpu topology text output
X-Git-Tag: v4.2.0rc~188
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/52a4925c3e1266a313b52a94b65738332839a097

kernel - Improve cpu topology text output

* Fix a bug the cpu range display to properly
  display e.g. cpu 3 through cpu 3 as cpu 3 instead
  of cpu 3-3.

* Makes sysctl hw.cpu_topology more readable.
---

diff --git a/sys/kern/subr_cpu_topology.c b/sys/kern/subr_cpu_topology.c
index 6f525210ff..0663a775c0 100644
--- a/sys/kern/subr_cpu_topology.c
+++ b/sys/kern/subr_cpu_topology.c
@@ -671,7 +671,7 @@ sbuf_print_cpuset(struct sbuf *sb, cpumask_t *mask)
 	if (more)
 		sbuf_printf(sb, ", ");
 	if (b >= 0) {
-		if (b == e + 1) {
+		if (b == e - 1) {
 			sbuf_printf(sb, "%d", b);
 		} else {
 			sbuf_printf(sb, "%d-%d", b, e - 1);
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index d49d136cb4..60db6ef564 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1330,7 +1330,7 @@ kprint_cpuset(cpumask_t *mask)
 	if (more)
 		kprintf(", ");
 	if (b >= 0) {
-		if (b == e + 1) {
+		if (b == e - 1) {
 			kprintf("%d", b);
 		} else {
 			kprintf("%d-%d", b, e - 1);