Message ID | 20200317103309.069345868@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=f8y2=5C=vger.kernel.org=stable-owner@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FA74C18E5B for <stable@archiver.kernel.org>; Tue, 17 Mar 2020 10:59:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78EDC20757 for <stable@archiver.kernel.org>; Tue, 17 Mar 2020 10:59:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584442779; bh=PM8pvE6OwB8LDMCq4KfLYQAvcmFk6uCBwLt+Y0/b59A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rtVkqy2CCSZxapDSwzFYS2qplLu7rhmc3Rvw/uuLYA17c7cLGn1km3d1pQqf/NY57 KeFRBRPJMGx+OZTfMqbGmobZislKXqyvksia7gM6ZOnnpJLa1BXd8KCeSMSLot6o0p UQqVoaRRP0YESbHGFIkN2aYdIzdnPaZ90ZhUCGrU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727088AbgCQK7i (ORCPT <rfc822;stable@archiver.kernel.org>); Tue, 17 Mar 2020 06:59:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:38114 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727468AbgCQK7f (ORCPT <rfc822;stable@vger.kernel.org>); Tue, 17 Mar 2020 06:59:35 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9422420658; Tue, 17 Mar 2020 10:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584442775; bh=PM8pvE6OwB8LDMCq4KfLYQAvcmFk6uCBwLt+Y0/b59A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2CCiXbg0BzB9iJG5/slSaTB7yquxdMErytO0BNCkmSgYM4q9MMOU5HYkWTE0DnSCp XZtPm9gNdtl55KlE93AcBbzEjiIuMH0jJ8m3HsXyB8rb9FXyxJrspczAq6RDDS5v7Z Odaeh92IiyaFe99Bjxcy/7huFko64zGknQZ6K+es= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Tommi Rantala <tommi.t.rantala@nokia.com>, Arnaldo Carvalho de Melo <acme@redhat.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Darren Hart <dvhart@infradead.org>, Davidlohr Bueso <dave@stgolabs.net>, Jiri Olsa <jolsa@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Namhyung Kim <namhyung@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH 4.19 78/89] perf bench futex-wake: Restore thread count default to online CPU count Date: Tue, 17 Mar 2020 11:55:27 +0100 Message-Id: <20200317103309.069345868@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103259.744774526@linuxfoundation.org> References: <20200317103259.744774526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/tools/perf/bench/futex-wake.c +++ b/tools/perf/bench/futex-wake.c @@ -42,7 +42,7 @@ static bool done = false, silent = false static pthread_mutex_t thread_lock; static pthread_cond_t thread_parent, thread_worker; static struct stats waketime_stats, wakeup_stats; -static unsigned int ncpus, threads_starting, nthreads = 0; +static unsigned int threads_starting, nthreads = 0; static int futex_flag = 0; static const struct option options[] = { @@ -140,7 +140,7 @@ int bench_futex_wake(int argc, const cha sigaction(SIGINT, &act, NULL); if (!nthreads) - nthreads = ncpus; + nthreads = cpu->nr; worker = calloc(nthreads, sizeof(*worker)); if (!worker)