From owner-svn-src-projects@FreeBSD.ORG Mon Jul 4 10:45:55 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 41622106564A; Mon, 4 Jul 2011 10:45:55 +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 25E228FC12; Mon, 4 Jul 2011 10:45:55 +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 p64Ajttk058538; Mon, 4 Jul 2011 10:45:55 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p64AjteU058509; Mon, 4 Jul 2011 10:45:55 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201107041045.p64AjteU058509@svn.freebsd.org> From: Attilio Rao Date: Mon, 4 Jul 2011 10:45:54 +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: r223756 - in projects/largeSMP: lib/libkvm sys/kern sys/sys 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: Mon, 04 Jul 2011 10:45:55 -0000 Author: attilio Date: Mon Jul 4 10:45:54 2011 New Revision: 223756 URL: http://svn.freebsd.org/changeset/base/223756 Log: Completely remove now unused pc_other_cpus, pc_cpumask. Tested by: pluknet Modified: projects/largeSMP/lib/libkvm/kvm_pcpu.c projects/largeSMP/sys/kern/subr_pcpu.c projects/largeSMP/sys/sys/pcpu.h Modified: projects/largeSMP/lib/libkvm/kvm_pcpu.c ============================================================================== --- projects/largeSMP/lib/libkvm/kvm_pcpu.c Mon Jul 4 07:37:28 2011 (r223755) +++ projects/largeSMP/lib/libkvm/kvm_pcpu.c Mon Jul 4 10:45:54 2011 (r223756) @@ -39,13 +39,11 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include #include #include -#include #include "kvm_private.h" @@ -120,9 +118,6 @@ _kvm_pcpu_clear(void) void * kvm_getpcpu(kvm_t *kd, int cpu) { - long kcpusetsize; - ssize_t nbytes; - uintptr_t readptr; char *buf; if (kd == NULL) { @@ -130,10 +125,6 @@ kvm_getpcpu(kvm_t *kd, int cpu) return (NULL); } - kcpusetsize = sysconf(_SC_CPUSET_SIZE); - if (kcpusetsize == -1 || (u_long)kcpusetsize > sizeof(cpuset_t)) - return ((void *)-1); - if (maxcpu == 0) if (_kvm_pcpu_init(kd) < 0) return ((void *)-1); @@ -146,26 +137,8 @@ kvm_getpcpu(kvm_t *kd, int cpu) _kvm_err(kd, kd->program, "out of memory"); return ((void *)-1); } - nbytes = sizeof(struct pcpu) - 2 * kcpusetsize; - readptr = (uintptr_t)pcpu_data[cpu]; - if (kvm_read(kd, readptr, buf, nbytes) != nbytes) { - _kvm_err(kd, kd->program, "unable to read per-CPU data"); - free(buf); - return ((void *)-1); - } - - /* Fetch the valid cpuset_t objects. */ - CPU_ZERO((cpuset_t *)(buf + nbytes)); - CPU_ZERO((cpuset_t *)(buf + nbytes + sizeof(cpuset_t))); - readptr += nbytes; - if (kvm_read(kd, readptr, buf + nbytes, kcpusetsize) != kcpusetsize) { - _kvm_err(kd, kd->program, "unable to read per-CPU data"); - free(buf); - return ((void *)-1); - } - readptr += kcpusetsize; - if (kvm_read(kd, readptr, buf + nbytes + sizeof(cpuset_t), - kcpusetsize) != kcpusetsize) { + if (kvm_read(kd, (uintptr_t)pcpu_data[cpu], buf, + sizeof(struct pcpu)) != sizeof(struct pcpu)) { _kvm_err(kd, kd->program, "unable to read per-CPU data"); free(buf); return ((void *)-1); Modified: projects/largeSMP/sys/kern/subr_pcpu.c ============================================================================== --- projects/largeSMP/sys/kern/subr_pcpu.c Mon Jul 4 07:37:28 2011 (r223755) +++ projects/largeSMP/sys/kern/subr_pcpu.c Mon Jul 4 10:45:54 2011 (r223756) @@ -87,7 +87,6 @@ pcpu_init(struct pcpu *pcpu, int cpuid, KASSERT(cpuid >= 0 && cpuid < MAXCPU, ("pcpu_init: invalid cpuid %d", cpuid)); pcpu->pc_cpuid = cpuid; - CPU_SETOF(cpuid, &pcpu->pc_cpumask); cpuid_to_pcpu[cpuid] = pcpu; STAILQ_INSERT_TAIL(&cpuhead, pcpu, pc_allcpu); cpu_pcpu_init(pcpu, cpuid, size); Modified: projects/largeSMP/sys/sys/pcpu.h ============================================================================== --- projects/largeSMP/sys/sys/pcpu.h Mon Jul 4 07:37:28 2011 (r223755) +++ projects/largeSMP/sys/sys/pcpu.h Mon Jul 4 10:45:54 2011 (r223756) @@ -196,18 +196,6 @@ struct pcpu { * if only to make kernel debugging easier. */ PCPU_MD_FIELDS; - - /* - * XXX - * For the time being, keep the cpuset_t objects as the very last - * members of the structure. - * They are actually tagged to be removed soon, but as long as this - * does not happen, it is necessary to find a way to implement - * easilly interfaces to userland and leaving them last makes that - * possible. - */ - cpuset_t pc_cpumask; /* This cpu mask */ - cpuset_t pc_other_cpus; /* Mask of all other cpus */ } __aligned(CACHE_LINE_SIZE); #ifdef _KERNEL