svn commit: r222547 - in projects/largeSMP: gnu/usr.bin/gdb/kgdb lib/libkvm lib/libmemstat usr.sbin/pmccontrol

[Attilio Rao]

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");
 	}