From 828d8bb00bd92773daeae970dce4078bf307b207 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Fri, 16 Dec 2011 11:08:03 +0800 Subject: [PATCH] nexus/intr: Change the wrong cpuid backtrace to assertion --- sys/platform/pc32/i386/nexus.c | 7 ++----- sys/platform/pc64/x86_64/nexus.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c index 0ae3d48..b321bbc 100644 --- a/sys/platform/pc32/i386/nexus.c +++ b/sys/platform/pc32/i386/nexus.c @@ -355,11 +355,8 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, switch (type) { case SYS_RES_IRQ: - if (cpuid < 0 || cpuid >= ncpus) { - kprintf("NEXUS cpuid %d:\n", cpuid); - print_backtrace(-1); - cpuid = 0; /* XXX */ - } + 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 4fca4e3..2ab6deb 100644 --- a/sys/platform/pc64/x86_64/nexus.c +++ b/sys/platform/pc64/x86_64/nexus.c @@ -351,11 +351,8 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, switch (type) { case SYS_RES_IRQ: - if (cpuid < 0 || cpuid >= ncpus) { - kprintf("NEXUS cpuid %d:\n", cpuid); - print_backtrace(-1); - cpuid = 0; /* XXX */ - } + KASSERT(cpuid >= 0 || cpuid < ncpus, + ("nexus invalid cpuid %d:\n", cpuid)); rm = &irq_rman[cpuid]; break; -- 1.7.7.2