From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 DB0F9C10F03 for ; Fri, 22 Mar 2019 12:21:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC676218B0 for ; Fri, 22 Mar 2019 12:21:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553257278; bh=oloJtzE09vzllUXRSEmWMfk+TzoHxJmzOqAggmADqZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kjb+08YYSMU1U76/tFfDePaKo8PFgIcbWqcSz88+71kmVTPNgnDjFj4SwEY6z9QjB y8Xl5U/zrfCkWsnONGdp0sxgk+LmNoOiO8695mn/+6Q3kiwSEk4v/mFmONWXTVB1QF 12UMnx48zFy+k0WBEkz3y+K3J/mrnM/ff7GCRsUo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390849AbfCVMVR (ORCPT ); Fri, 22 Mar 2019 08:21:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:60340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390846AbfCVMVR (ORCPT ); Fri, 22 Mar 2019 08:21:17 -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 0CB0E2054F; Fri, 22 Mar 2019 12:21:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553257276; bh=oloJtzE09vzllUXRSEmWMfk+TzoHxJmzOqAggmADqZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LyUYgvL9tqTxUkhrTXAFJMj2et81gD3DlePg836mesMxFzGjBB5C3VysLo6pp99l4 yGyG8mkOXRlIwboer8bcJT0GxdbUdAK2v60x3Md6R4DeEMtAMxjNSQDpTbWTiyB9Kr W9KItz48uQ48P5ke3JryXJS1E5eBffeJcvPfp3j8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kees Cook , "Rafael J. Wysocki" Subject: [PATCH 5.0 183/238] cpuidle: governor: Add new governors to cpuidle_governors again Date: Fri, 22 Mar 2019 12:16:42 +0100 Message-Id: <20190322111309.068955453@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111258.383569278@linuxfoundation.org> References: <20190322111258.383569278@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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: X-Mailing-List: stable@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rafael J. Wysocki commit 22782b3f9bb8ae21c710e2880db21bc729771e92 upstream. After commit 61cb5758d3c4 ("cpuidle: Add cpuidle.governor= command line parameter") new cpuidle governors are not added to the list of available governors, so governor selection via sysfs doesn't work as expected (even though it is rarely used anyway). Fix that by making cpuidle_register_governor() add new governors to cpuidle_governors again. Fixes: 61cb5758d3c4 ("cpuidle: Add cpuidle.governor= command line parameter") Reported-by: Kees Cook Cc: 5.0+ # 5.0+ Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/cpuidle/governor.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/cpuidle/governor.c +++ b/drivers/cpuidle/governor.c @@ -89,6 +89,7 @@ int cpuidle_register_governor(struct cpu mutex_lock(&cpuidle_lock); if (__cpuidle_find_governor(gov->name) == NULL) { ret = 0; + list_add_tail(&gov->governor_list, &cpuidle_governors); if (!cpuidle_curr_governor || !strncasecmp(param_governor, gov->name, CPUIDLE_NAME_LEN) || (cpuidle_curr_governor->rating < gov->rating &&