From owner-svn-src-all@FreeBSD.ORG Sat Sep 14 13:12:13 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D516DB6; Sat, 14 Sep 2013 13:12:13 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C1ABB265B; Sat, 14 Sep 2013 13:12:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8EDCDXk027814; Sat, 14 Sep 2013 13:12:13 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8EDCDQX027813; Sat, 14 Sep 2013 13:12:13 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201309141312.r8EDCDQX027813@svn.freebsd.org> From: Alexander Motin Date: Sat, 14 Sep 2013 13:12:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r255569 - stable/9/sys/kern X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 13:12:13 -0000 Author: mav Date: Sat Sep 14 13:12:13 2013 New Revision: 255569 URL: http://svnweb.freebsd.org/changeset/base/255569 Log: Temporary revert r255541 since there is no CPU_FFS in stable/9 yet. Sorry. Modified: stable/9/sys/kern/sched_ule.c Modified: stable/9/sys/kern/sched_ule.c ============================================================================== --- stable/9/sys/kern/sched_ule.c Sat Sep 14 10:14:09 2013 (r255568) +++ stable/9/sys/kern/sched_ule.c Sat Sep 14 13:12:13 2013 (r255569) @@ -632,14 +632,10 @@ cpu_search(const struct cpu_group *cg, s } /* Iterate through the child CPU groups and then remaining CPUs. */ - for (i = cg->cg_children, cpu = mp_maxid; ; ) { + for (i = cg->cg_children, cpu = mp_maxid; i >= 0; ) { if (i == 0) { -#ifdef HAVE_INLINE_FFSL - cpu = CPU_FFS(&cpumask) - 1; -#else while (cpu >= 0 && !CPU_ISSET(cpu, &cpumask)) cpu--; -#endif if (cpu < 0) break; child = NULL; @@ -664,7 +660,6 @@ cpu_search(const struct cpu_group *cg, s break; } } else { /* Handle child CPU. */ - CPU_CLR(cpu, &cpumask); tdq = TDQ_CPU(cpu); load = tdq->tdq_load * 256; rndptr = DPCPU_PTR(randomval); @@ -712,11 +707,8 @@ cpu_search(const struct cpu_group *cg, s i--; if (i == 0 && CPU_EMPTY(&cpumask)) break; - } -#ifndef HAVE_INLINE_FFSL - else + } else cpu--; -#endif } return (total); }