From patchwork Fri Jul 12 09:11:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 168918 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp603033ilk; Fri, 12 Jul 2019 02:12:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqy32BcwLx94dW/TVvz7GPuMgA8/MeVe2mxq76U3RBaLkCAZ6DK1yKtAv6xi+eler1uaclTq X-Received: by 2002:a17:90b:28f:: with SMTP id az15mr10286867pjb.18.1562922724470; Fri, 12 Jul 2019 02:12:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562922724; cv=none; d=google.com; s=arc-20160816; b=Uk09Wag3vPKnGe52D4but8nXoVcO3hdho8wCiz1mbNbd8VzW5moXpw1KfTabBMhCji 0lZ8lhbJOQTfvcE/jeICFFg0uZHQB+nW1mYK3VCwQOkZN2hwSocOor4FqsIa6bCpp9MT pris5g938qhzT3X9x4aidaVUPwSf+TL87EV5IFH5EtF0ZgVNzgieQatxcdrksQsr1Z82 iZKKuiGdawNrYoIgv0f9m1km6D6rCZJqg+7LS+Vo5iXpUxjQf+UQo6TuYanmeLYNYGIQ cM/QSe8rb9UOeJtLurp3S2UvW+zEzEwkO1ee/KUjcTk7n48Jedcqk6NaKKbepN6LpbrA lBRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=nh45F2PS0uH+h2wY6iFXunuS7WHkwtGS4SjL6R9jQCk=; b=oLHhg8et+FU6ED5kRNKUBGoMPGFRR54vX3tBTW0MIDh8obE+PXSJYeYIAQfVgjeaCV jeXlQVJO0YSk90ppBNre6k/pnjJ3y9o102t/xdQGeuyurMC8ERyIfKFkjCTRNGSFJq2F cHjjb8MgI0Q9xXDWmk4uL0DE3+Ymbaqdqtdvf4UZdTXYFNOV1eNt36iDY09B+KBVv13H RHQckn5p6xxJR437sEK20dX+uFr8pbwTGWXOgezdIMHffbS6pvnBT0EJOtZmJ/xS5yaf 0uJAaX2taTpKpvoUfo5Jo6i2anLRma1iuzAz98l+L2vg4YiLqObZOkvAvMVqq12gSwq4 m1pQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 32si7322914pla.181.2019.07.12.02.12.04; Fri, 12 Jul 2019 02:12:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726585AbfGLJMD (ORCPT + 29 others); Fri, 12 Jul 2019 05:12:03 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:35829 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725989AbfGLJMC (ORCPT ); Fri, 12 Jul 2019 05:12:02 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1MnaTt-1iDnxj0N1B-00jd8T; Fri, 12 Jul 2019 11:11:50 +0200 From: Arnd Bergmann To: Hugh Dickins Cc: Arnd Bergmann , David Howells , Al Viro , Andrew Morton , Matthew Wilcox , Vlastimil Babka , Andrea Arcangeli , Vineeth Remanan Pillai , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] thp: fix unused shmem_parse_huge() function warning Date: Fri, 12 Jul 2019 11:11:31 +0200 Message-Id: <20190712091141.673355-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:2eYIEw+FuGFLaFFnKIH/ts58p8jvvELIVRGUWlzkTykX3ykX0/v ts+nAn49miAUJt8DvK+mqbmcyi6PwAVzbh9XnS5MWrU1+0O/eSmcmtzcL9ONUd/zHoqYZcr fsERZV6Xr78UtnbuWoFCE8702Z6CLbbbh8uTN8jvzkak2k/Uz76hgbkwxo/Sl1gDg9Wr9RL vH2DwCgQDpxF8RtsHhT/w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:kB4x/oMdogU=:EO0/ZP+FT9QwyUf+U6kfWc 7qWi0vAfAJ0UNZxCoPw1s9vdsQR5HuuxaUcG620tLFT5CDfqfKRlAZZ2zi09a1BGb7yxqoIqs dXF7oouoNuO8xAB9EwpGaBiEzWxZIXheV8BK4jZ1wYdrMVrvEYx+G39Ltz0ecHVVOd8fgh66o HFRmBkzd81ZvnRLNE30PdmqghI1UMsKfQ4gf00oSovZ9UU0wRhXENIcgQLuJzA9rTcMX203Bq aubOpVMzPrrxwCZxb2bpRmgAL9PnYCwHqw7vBG5BDxlPD40BZdXfq2hzCTsKhM+FigKAr5y80 auciZSt6hMaNNlL8AqEERLNvLNgvGES2Z7Gc8lOtYlyvR8I/wSg/x1Ke998J3R8oGwrutri/Z Xw15NZr+Oh+i3sGPXFx7K5SVXJPXJ0F3hQhk0LwBwITvpcNwFDGsGQAsow2L1yJRItHppX901 7rHz2v7ZaC/8vdF04KI9HM+LftErdeoJHUDXBYpFJMJKx50Ja/JLDPLDlrufKTizK5oCATuZv KD0pTtN/NQdld53T3TbwP0T7386ZTJvtRlP+LyHZioJxy/RsnaaSwPkWz3xXK5ou0WtLNUyOw Es67mvHLLd5k/DylVctvadLlv1rNaqd8TlemH7KRuNT3bh9gDDCdiwz0d6BkmPr9tjf8Kq2FM wAUBQZ2G2DwJ8HAPIOTLd3bTMLSdM2cbK7Tvl/wQCz0XpCvZ2ugC+PBDteVUooi3bLMAdaC15 fCKn4ZEtReAb3mM0txlBiUjFw2vGxdSET/R6pg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_SYSFS is disabled but CONFIG_TMPFS is enabled, we get a warning about shmem_parse_huge() never being called: mm/shmem.c:417:12: error: unused function 'shmem_parse_huge' [-Werror,-Wunused-function] static int shmem_parse_huge(const char *str) Change the #ifdef so we no longer build this function in that configuration. Fixes: 144df3b288c4 ("vfs: Convert ramfs, shmem, tmpfs, devtmpfs, rootfs to use the new mount API") Signed-off-by: Arnd Bergmann --- mm/shmem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.0 diff --git a/mm/shmem.c b/mm/shmem.c index ba40fac908c5..32aa9d46b87c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -413,7 +413,7 @@ static bool shmem_confirm_swap(struct address_space *mapping, static int shmem_huge __read_mostly; -#if defined(CONFIG_SYSFS) || defined(CONFIG_TMPFS) +#if defined(CONFIG_SYSFS) static int shmem_parse_huge(const char *str) { if (!strcmp(str, "never")) @@ -430,7 +430,9 @@ static int shmem_parse_huge(const char *str) return SHMEM_HUGE_FORCE; return -EINVAL; } +#endif +#if defined(CONFIG_SYSFS) || defined(CONFIG_TMPFS) static const char *shmem_format_huge(int huge) { switch (huge) {