Date: Thu, 9 May 2013 00:16:41 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r250398 - in user/attilio/jeff-numa/sys: kern sparc64/include sparc64/sparc64 x86/x86 Message-ID: <201305090016.r490Gfki085155@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Thu May 9 00:16:41 2013 New Revision: 250398 URL: http://svnweb.freebsd.org/changeset/base/250398 Log: Revert bitset usage based on HEAD sync. Modified: user/attilio/jeff-numa/sys/kern/kern_cpuset.c user/attilio/jeff-numa/sys/kern/kern_ktr.c user/attilio/jeff-numa/sys/sparc64/include/ktr.h user/attilio/jeff-numa/sys/sparc64/sparc64/genassym.c user/attilio/jeff-numa/sys/sparc64/sparc64/intr_machdep.c user/attilio/jeff-numa/sys/sparc64/sparc64/mp_exception.S user/attilio/jeff-numa/sys/sparc64/sparc64/swtch.S user/attilio/jeff-numa/sys/x86/x86/intr_machdep.c Modified: user/attilio/jeff-numa/sys/kern/kern_cpuset.c ============================================================================== --- user/attilio/jeff-numa/sys/kern/kern_cpuset.c Thu May 9 00:14:24 2013 (r250397) +++ user/attilio/jeff-numa/sys/kern/kern_cpuset.c Thu May 9 00:16:41 2013 (r250398) @@ -630,7 +630,7 @@ cpusetobj_ffs(const cpuset_t *set) for (i = 0; i < _NCPUWORDS; i++) { if (set->__bits[i] != 0) { cbit = ffsl(set->__bits[i]); - cbit += i * _BITSET_BITS; + cbit += i * _NCPUBITS; break; } } Modified: user/attilio/jeff-numa/sys/kern/kern_ktr.c ============================================================================== --- user/attilio/jeff-numa/sys/kern/kern_ktr.c Thu May 9 00:14:24 2013 (r250397) +++ user/attilio/jeff-numa/sys/kern/kern_ktr.c Thu May 9 00:16:41 2013 (r250398) @@ -104,7 +104,7 @@ int ktr_entries = KTR_BOOT_ENTRIES; int ktr_version = KTR_VERSION; struct ktr_entry ktr_buf_init[KTR_BOOT_ENTRIES]; struct ktr_entry *ktr_buf = ktr_buf_init; -cpuset_t ktr_cpumask = BITSET_T_INITIALIZER(KTR_CPUMASK); +cpuset_t ktr_cpumask = CPUSET_T_INITIALIZER(KTR_CPUMASK); static char ktr_cpumask_str[CPUSETBUFSIZ]; TUNABLE_INT("debug.ktr.mask", &ktr_mask); Modified: user/attilio/jeff-numa/sys/sparc64/include/ktr.h ============================================================================== --- user/attilio/jeff-numa/sys/sparc64/include/ktr.h Thu May 9 00:14:24 2013 (r250397) +++ user/attilio/jeff-numa/sys/sparc64/include/ktr.h Thu May 9 00:16:41 2013 (r250398) @@ -81,7 +81,7 @@ l2: add r2, 1, r3 ; \ brz r1, l3 ## f ; \ nop ; \ lduw [PCPU(CPUID)], r2 ; \ - mov _BITSET_BITS, r3 ; \ + mov _NCPUBITS, r3 ; \ mov %g0, %y ; \ udiv r2, r3, r2 ; \ srl r2, 0, r2 ; \ @@ -89,7 +89,7 @@ l2: add r2, 1, r3 ; \ SET(ktr_cpumask, r3, r1) ; \ ldx [r1 + r2], r1 ; \ lduw [PCPU(CPUID)], r2 ; \ - mov _BITSET_BITS, r3 ; \ + mov _NCPUBITS, r3 ; \ mov %g0, %y ; \ udiv r2, r3, r2 ; \ srl r2, 0, r2 ; \ Modified: user/attilio/jeff-numa/sys/sparc64/sparc64/genassym.c ============================================================================== --- user/attilio/jeff-numa/sys/sparc64/sparc64/genassym.c Thu May 9 00:14:24 2013 (r250397) +++ user/attilio/jeff-numa/sys/sparc64/sparc64/genassym.c Thu May 9 00:16:41 2013 (r250398) @@ -58,7 +58,7 @@ ASSYM(PCPU_PAGES, PCPU_PAGES); ASSYM(TAR_VPN_SHIFT, TAR_VPN_SHIFT); -ASSYM(_BITSET_BITS, _BITSET_BITS); +ASSYM(_NCPUBITS, _NCPUBITS); ASSYM(TLB_DEMAP_ALL, TLB_DEMAP_ALL); ASSYM(TLB_DEMAP_CONTEXT, TLB_DEMAP_CONTEXT); Modified: user/attilio/jeff-numa/sys/sparc64/sparc64/intr_machdep.c ============================================================================== --- user/attilio/jeff-numa/sys/sparc64/sparc64/intr_machdep.c Thu May 9 00:14:24 2013 (r250397) +++ user/attilio/jeff-numa/sys/sparc64/sparc64/intr_machdep.c Thu May 9 00:16:41 2013 (r250398) @@ -456,7 +456,7 @@ intr_describe(int vec, void *ih, const c * allocate CPUs round-robin. */ -static cpuset_t intr_cpus = BITSET_T_INITIALIZER(0x1); +static cpuset_t intr_cpus = CPUSET_T_INITIALIZER(0x1); static int current_cpu; static void Modified: user/attilio/jeff-numa/sys/sparc64/sparc64/mp_exception.S ============================================================================== --- user/attilio/jeff-numa/sys/sparc64/sparc64/mp_exception.S Thu May 9 00:14:24 2013 (r250397) +++ user/attilio/jeff-numa/sys/sparc64/sparc64/mp_exception.S Thu May 9 00:16:41 2013 (r250398) @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #define IPI_DONE(r1, r2, r3, r4, r5, r6) \ rd %y, r6 ; \ lduw [PCPU(CPUID)], r2 ; \ - mov _BITSET_BITS, r3 ; \ + mov _NCPUBITS, r3 ; \ mov %g0, %y ; \ udiv r2, r3, r4 ; \ srl r4, 0, r5 ; \ Modified: user/attilio/jeff-numa/sys/sparc64/sparc64/swtch.S ============================================================================== --- user/attilio/jeff-numa/sys/sparc64/sparc64/swtch.S Thu May 9 00:14:24 2013 (r250397) +++ user/attilio/jeff-numa/sys/sparc64/sparc64/swtch.S Thu May 9 00:16:41 2013 (r250398) @@ -172,7 +172,7 @@ ENTRY(cpu_switch) * Mark the pmap of the last non-kernel vmspace to run as no longer * active on this CPU. */ - mov _BITSET_BITS, %l5 + mov _NCPUBITS, %l5 mov %g0, %y udiv %l3, %l5, %l6 srl %l6, 0, %l4 @@ -241,7 +241,7 @@ ENTRY(cpu_switch) /* * Mark the pmap as active on this CPU. */ - mov _BITSET_BITS, %l5 + mov _NCPUBITS, %l5 mov %g0, %y udiv %l3, %l5, %l6 srl %l6, 0, %l4 Modified: user/attilio/jeff-numa/sys/x86/x86/intr_machdep.c ============================================================================== --- user/attilio/jeff-numa/sys/x86/x86/intr_machdep.c Thu May 9 00:14:24 2013 (r250397) +++ user/attilio/jeff-numa/sys/x86/x86/intr_machdep.c Thu May 9 00:16:41 2013 (r250398) @@ -452,7 +452,7 @@ DB_SHOW_COMMAND(irqs, db_show_irqs) * allocate CPUs round-robin. */ -static cpuset_t intr_cpus = BITSET_T_INITIALIZER(0x1); +static cpuset_t intr_cpus = CPUSET_T_INITIALIZER(0x1); static int current_cpu; /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305090016.r490Gfki085155>