From patchwork Tue Oct 8 14:15:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 11179673 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2F30114DB for ; Tue, 8 Oct 2019 14:15:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EF07121721 for ; Tue, 8 Oct 2019 14:15:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lca.pw header.i=@lca.pw header.b="TZMym48p" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF07121721 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lca.pw Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2469B8E0005; Tue, 8 Oct 2019 10:15:27 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1F66F8E0003; Tue, 8 Oct 2019 10:15:27 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10C9C8E0005; Tue, 8 Oct 2019 10:15:27 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0162.hostedemail.com [216.40.44.162]) by kanga.kvack.org (Postfix) with ESMTP id E462B8E0003 for ; Tue, 8 Oct 2019 10:15:26 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 80D26180AD805 for ; Tue, 8 Oct 2019 14:15:26 +0000 (UTC) X-FDA: 76020815052.25.mice64_125c128e33959 X-Spam-Summary: 2,0,0,41d75d563ebd8a47,d41d8cd98f00b204,cai@lca.pw,:akpm@linux-foundation.org::linux-kernel@vger.kernel.org:cai@lca.pw,RULES_HIT:41:355:379:541:800:960:967:968:973:988:989:1260:1263:1345:1437:1534:1541:1711:1730:1747:1777:1792:2393:2525:2559:2563:2682:2685:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3352:3865:3870:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4605:5007:6120:6261:6653:7901:8599:9025:9592:10004:10913:11026:11658:11914:12043:12296:12297:12438:12517:12519:12555:12783:12895:12986:13069:13161:13229:13311:13357:14018:14096:14181:14384:14394:14721:14849:21080:21444:21451:21611:21627:30054,0,RBL:209.85.160.196:@lca.pw:.lbl8.mailshell.net-62.14.0.100 66.201.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:109,LUA_SUMMARY:none X-HE-Tag: mice64_125c128e33959 X-Filterd-Recvd-Size: 3842 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by imf19.hostedemail.com (Postfix) with ESMTP for ; Tue, 8 Oct 2019 14:15:26 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id n7so25509968qtb.6 for ; Tue, 08 Oct 2019 07:15:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=from:to:cc:subject:date:message-id; bh=uwFtPUZwVRjZpH4kYXqEMZKLuNiu2uGm9J01G5C31U4=; b=TZMym48pDuPlxKUUJxLI1VhchjsRC2fmrqBBPap+SODl1xzDYd05ajV2SylRND62bO bsbi9QiNsOeHyrkxc1T8PMfnEVyGtZU/tstXPZPdqpi/r/SG03aKj6IL8MkWEFOKQ4DN 3f4YBg6x0du9c/0m7Zff5oT6cG+1xLylMOdmnT76XH6MVzW5/VfQJB7D8Wp93g8Fj5OF u1BDxyOZalZh7/RdjWMs1UaWwvdaHTmimJ5ck0CeTwUeTkZOCXu8/AP8Z7OTxF45ANzG ue3iKCq0AQ6K3jMwQDMrFVn/OsXjgGpjgc/e/687dO0aE0fzoRrhRMeZaN1QBSKp8cQ7 rlbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uwFtPUZwVRjZpH4kYXqEMZKLuNiu2uGm9J01G5C31U4=; b=Y4A1EdoQH0txLc04nImksLS2goe61OljzfyHa9j8ecgfaHFUId2BiZTSHWHB3z87CN KDIqc6+RWYqpoH8uxgJpva6HjBYVSB7d9Z2lSHGxgnnAY7QZ/0G6yekUHH8U4u+acNyT ntGvLcmKBBLHHrTazePMDVrhglRbwjI7HRJUqcMpo8gumBPKVRvhP7AJkSNZg9SUkWRo BFtzfUlkeiJGoWnTDMD44yjTJTXRIbrddJyM4l3D6dK3ediine7RiUZw0LtzNFz752MY 2mE5TAKovtwWd3WACW4xk47n4mtRJlOyMwUroQgtvXxpfPf8PZmKULre0069fDjiQiW3 ML7g== X-Gm-Message-State: APjAAAVdPL2wal9KzV3yYHTdN+HEzzBo9YZqE7W42cQCiF6BfszhNlZT 06ojWSK2VARVrhtFB5BadSvROE7hQtk= X-Google-Smtp-Source: APXvYqwD03tQqikk2X5yhay3dM1yanfnAHyiYLgkAuyI8Spf2jLueDyyZ1kZCYsdrYuY0WXdQg5TcA== X-Received: by 2002:aed:2a3d:: with SMTP id c58mr37138594qtd.263.1570544125543; Tue, 08 Oct 2019 07:15:25 -0700 (PDT) Received: from qcai.nay.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id d133sm9563134qkg.31.2019.10.08.07.15.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Oct 2019 07:15:24 -0700 (PDT) From: Qian Cai To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH -next] mm/userfaultfd: fix a GCC compilation warning Date: Tue, 8 Oct 2019 10:15:08 -0400 Message-Id: <1570544108-32331-1-git-send-email-cai@lca.pw> X-Mailer: git-send-email 1.8.3.1 X-Bogosity: Ham, tests=bogofilter, spamicity=0.016463, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The linux-next commit "hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix" seems accidentally add back an unused variable that was correctly removed in the commit "hugetlb: remove unused hstate in hugetlb_fault_mutex_hash()" [1]. mm/userfaultfd.c: In function '__mcopy_atomic_hugetlb': mm/userfaultfd.c:217:17: warning: variable 'h' set but not used [-Wunused-but-set-variable] struct hstate *h; ^ [1] http://lkml.kernel.org/r/20191005003302.785-1-richardw.yang@linux.intel.com Signed-off-by: Qian Cai --- mm/userfaultfd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 4cb4ef3d9128..1b0d7abad1d4 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -214,7 +214,6 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, unsigned long src_addr, dst_addr; long copied; struct page *page; - struct hstate *h; unsigned long vma_hpagesize; pgoff_t idx; u32 hash; @@ -271,8 +270,6 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, goto out_unlock; } - h = hstate_vma(dst_vma); - while (src_addr < src_start + len) { pte_t dst_pteval;