From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Sun, 18 Dec 2011 02:17:48 +0000 (+0800)
Subject: nexus/intr: Properly assert cpuid for interrupt resources
X-Git-Tag: v3.0.0~361
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/0f58fbd95e0048feea002c90182dc188f0dfc07c

nexus/intr: Properly assert cpuid for interrupt resources

Noticed-by: Nuno Antunes
---

diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c
index 92cb4a5063..0135d5bec8 100644
--- a/sys/platform/pc32/i386/nexus.c
+++ b/sys/platform/pc32/i386/nexus.c
@@ -355,7 +355,7 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 
 	switch (type) {
 	case SYS_RES_IRQ:
-		KASSERT(cpuid >= 0 || cpuid < ncpus,
+		KASSERT(cpuid >= 0 && cpuid < ncpus,
 		    ("nexus invalid cpuid %d:\n", cpuid));
 		rm = &irq_rman[cpuid];
 		break;
diff --git a/sys/platform/pc64/x86_64/nexus.c b/sys/platform/pc64/x86_64/nexus.c
index 156b9b6264..020f30f049 100644
--- a/sys/platform/pc64/x86_64/nexus.c
+++ b/sys/platform/pc64/x86_64/nexus.c
@@ -351,7 +351,7 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 
 	switch (type) {
 	case SYS_RES_IRQ:
-		KASSERT(cpuid >= 0 || cpuid < ncpus,
+		KASSERT(cpuid >= 0 && cpuid < ncpus,
 		    ("nexus invalid cpuid %d:\n", cpuid));
 		rm = &irq_rman[cpuid];
 		break;