Received: by 2002:a19:f614:0:0:0:0:0 with SMTP id x20csp57312lfe; Fri, 15 Apr 2022 19:20:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycHdkp+tCxfQ4Q5zWJS0Br+UNoK7xF5EY4/yRXz+T7kGnL7G3VQMz0HILJiCTiX1LUFQ8O X-Received: by 2002:a17:903:2451:b0:158:6d0d:bdb3 with SMTP id l17-20020a170903245100b001586d0dbdb3mr1489057pls.61.1650075605210; Fri, 15 Apr 2022 19:20:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650075605; cv=none; d=google.com; s=arc-20160816; b=v4gZd2wJmuDLy3I+fFPcYqVJwLmrAyVrlKr4pJflahVlnKL6ORjWHTbmxU9LCizDFJ fUuQAlY8FGs4T639RyNgYFGzIcGAU8165SS6fhyUQAyyzFWe1ydb/aMt/B7xcoxRsujr +2I9tr/mQ+UCh5xIwzRRjNVbcPUPL/VCNY1WiX+WKsVf+p7GMgqAn0Tcb9iLSPDrMjjy B9IakBRYXuyi6CzOX/3OrZHr6/79Rvqng3IQey5Osa/Cc/4kivtU7mE6owTXnh/MdEQl zyOC6rT2ufSX7tTXQZzXNi2mB4uNDan4fdSiS4NZd9u6D93LbQso44Jh1I5RO9vwHfo3 qyEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition:mime-version :message-id:subject:cc:to:from:date:dkim-signature; bh=bxVj2O1o7LGuwxK5yOR+4h1tW8wZ1StFjb76X3rSON4=; b=NHJ5ziuYh+I23c4xuNV/K60aKQaz+66Pyy9ZMTN55BzwxAsB5z5mo/3UxeTYggKrZS hE8+BNTPmn+AtQG2ELUD+TCoS7ET5dHhic0Ix+bilUTNrLr4dxQs6/BQKuGZP9IerLoh zEibEjdKJ4Y524h0oWjkosqOcUzMCuPto/qnK5+hCQejdVRrmRerTMQgUDHgkTIbHZX0 4NzjFLgZmeKz0kRTIxbeMbD6ZtDskS8SjgAibwfXbO59tvQWGP9A/CdIBPCAtqw/pBOI R9pl5zgVfwWW3O7Qa0p/0CWqLl9X7RQVKyD/KO+fF4oefJQ1lUp03Wda95FEVXcXoYpl S6Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=fKSuWrCm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id l21-20020a056a0016d500b004faec001782si3278866pfc.232.2022.04.15.19.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 19:20:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=fKSuWrCm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C679915755A; Fri, 15 Apr 2022 18:34:14 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238672AbiDOWRg (ORCPT + 99 others); Fri, 15 Apr 2022 18:17:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231145AbiDOWRf (ORCPT ); Fri, 15 Apr 2022 18:17:35 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A8E135867 for ; Fri, 15 Apr 2022 15:15:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To:References; bh=bxVj2O1o7LGuwxK5yOR+4h1tW8wZ1StFjb76X3rSON4=; b=fKSuWrCm6xuF4e2mK/cydfZ2/M AOwYUVsMSrAdmWo5UrNNcCftgKerHCLBwUfDGOvwh5XlyHvmiTxNkbueKWulSs+RQ7bjqTj9YqlmN VshG4TVTffz5jTDMivIQjw/OZBLtfzm9iAHrl7HoBaruRjQsPVgeZvjvi0tc/yB643bN9R264y139 dfD80J0zOmq2kUiy9gprlZsosoM9p9wKwBDqJMfsqy0nMeSskgnf4Yawe0rA8w/P18L4v3ZJeCob8 PORbz6wXQoTnVxMfbxBO7G3rA4hT0Sw/9G6r19ZvMbeaTTU6SBI17odF8gTK+zMYtOEo5jazfrPhG vuHuV7nw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nfUDW-00BYVL-LO; Fri, 15 Apr 2022 22:15:02 +0000 Date: Fri, 15 Apr 2022 15:15:02 -0700 From: Luis Chamberlain To: Andrew Morton Cc: zhanglianjie , patches@lists.linux.dev, linux-kernel@vger.kernel.org, Linux Memory Management List , mcgrof@kernel.org Subject: [PATCH sysctl-next] mm: fix unused variable kernel warning when SYSCTL=n Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: Luis Chamberlain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_SYSCTL=n the variable dirty_bytes_min which is just used as a minimum to a proc handler is not used. So just move this under the ifdef for CONFIG_SYSCTL. Fixes: aa779e510219 ("mm: move page-writeback sysctls to their own file") Reported-by: kernel test robot Signed-off-by: Luis Chamberlain --- Andrew, I can this via sysctl-next if that's OK with you. mm/page-writeback.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 438762173a59..4f51d0ac5043 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -89,9 +89,6 @@ static int vm_highmem_is_dirtyable; */ static int vm_dirty_ratio = 20; -/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */ -static const unsigned long dirty_bytes_min = 2 * PAGE_SIZE; - /* * vm_dirty_bytes starts at 0 (disabled) so that it is a function of * vm_dirty_ratio * the amount of dirtyable memory @@ -2077,6 +2074,10 @@ static int page_writeback_cpu_online(unsigned int cpu) } #ifdef CONFIG_SYSCTL + +/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */ +static const unsigned long dirty_bytes_min = 2 * PAGE_SIZE; + static struct ctl_table vm_page_writeback_sysctls[] = { { .procname = "dirty_background_ratio", -- 2.35.1