From owner-svn-src-projects@FreeBSD.ORG Tue May 31 20:59:54 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 021771065673; Tue, 31 May 2011 20:59:54 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CBF848FC12; Tue, 31 May 2011 20:59:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4VKxrUd039927; Tue, 31 May 2011 20:59:53 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4VKxrtP039922; Tue, 31 May 2011 20:59:53 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201105312059.p4VKxrtP039922@svn.freebsd.org> From: Attilio Rao Date: Tue, 31 May 2011 20:59:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222547 - in projects/largeSMP: gnu/usr.bin/gdb/kgdb lib/libkvm lib/libmemstat usr.sbin/pmccontrol X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2011 20:59:54 -0000 Author: attilio Date: Tue May 31 20:59:53 2011 New Revision: 222547 URL: http://svn.freebsd.org/changeset/base/222547 Log: Revert r222363, as bde@ pointed out the initial solution was far more correct. Modified: projects/largeSMP/gnu/usr.bin/gdb/kgdb/kthr.c projects/largeSMP/lib/libkvm/kvm_pcpu.c projects/largeSMP/lib/libmemstat/memstat_uma.c projects/largeSMP/usr.sbin/pmccontrol/pmccontrol.c Modified: projects/largeSMP/gnu/usr.bin/gdb/kgdb/kthr.c ============================================================================== --- projects/largeSMP/gnu/usr.bin/gdb/kgdb/kthr.c Tue May 31 20:48:58 2011 (r222546) +++ projects/largeSMP/gnu/usr.bin/gdb/kgdb/kthr.c Tue May 31 20:59:53 2011 (r222547) @@ -107,7 +107,7 @@ kgdb_thr_init(void) addr = kgdb_lookup("stopped_cpus"); CPU_ZERO(&stopped_cpus); cpusetsize = sysconf(_SC_CPUSET_SIZE); - if (cpusetsize != -1 && (size_t)cpusetsize <= sizeof(cpuset_t) && + if (cpusetsize != -1 && (u_long)cpusetsize <= sizeof(cpuset_t) && addr != 0) kvm_read(kvm, addr, &stopped_cpus, cpusetsize); Modified: projects/largeSMP/lib/libkvm/kvm_pcpu.c ============================================================================== --- projects/largeSMP/lib/libkvm/kvm_pcpu.c Tue May 31 20:48:58 2011 (r222546) +++ projects/largeSMP/lib/libkvm/kvm_pcpu.c Tue May 31 20:59:53 2011 (r222547) @@ -131,7 +131,7 @@ kvm_getpcpu(kvm_t *kd, int cpu) } kcpusetsize = sysconf(_SC_CPUSET_SIZE); - if (kcpusetsize == -1 || (size_t)kcpusetsize > sizeof(cpuset_t)) + if (kcpusetsize == -1 || (u_long)kcpusetsize > sizeof(cpuset_t)) return ((void *)-1); if (maxcpu == 0) Modified: projects/largeSMP/lib/libmemstat/memstat_uma.c ============================================================================== --- projects/largeSMP/lib/libmemstat/memstat_uma.c Tue May 31 20:48:58 2011 (r222546) +++ projects/largeSMP/lib/libmemstat/memstat_uma.c Tue May 31 20:59:53 2011 (r222547) @@ -341,7 +341,7 @@ memstat_kvm_uma(struct memory_type_list return (-1); } cpusetsize = sysconf(_SC_CPUSET_SIZE); - if (cpusetsize == -1 || (size_t)cpusetsize > sizeof(cpuset_t)) { + if (cpusetsize == -1 || (u_long)cpusetsize > sizeof(cpuset_t)) { list->mtl_error = MEMSTAT_ERROR_KVM_NOSYMBOL; return (-1); } Modified: projects/largeSMP/usr.sbin/pmccontrol/pmccontrol.c ============================================================================== --- projects/largeSMP/usr.sbin/pmccontrol/pmccontrol.c Tue May 31 20:48:58 2011 (r222546) +++ projects/largeSMP/usr.sbin/pmccontrol/pmccontrol.c Tue May 31 20:59:53 2011 (r222547) @@ -148,7 +148,7 @@ pmcc_do_enable_disable(struct pmcc_op_li /* Determine the set of active CPUs. */ cpusetsize = sysconf(_SC_CPUSET_SIZE); - if (cpusetsize == -1 || (size_t)cpusetsize > sizeof(cpuset_t)) { + if (cpusetsize == -1 || (u_long)cpusetsize > sizeof(cpuset_t)) { err(EX_OSERR, "ERROR: Cannot determine which CPUs are " "halted"); }