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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A6F9EB64DC for ; Tue, 4 Jul 2023 01:00:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BA89B280047; Mon, 3 Jul 2023 21:00:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B328028003F; Mon, 3 Jul 2023 21:00:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F911280047; Mon, 3 Jul 2023 21:00:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8DA6828003F for ; Mon, 3 Jul 2023 21:00:10 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3A9021C88BD for ; Tue, 4 Jul 2023 01:00:10 +0000 (UTC) X-FDA: 80972122980.08.C570B53 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf24.hostedemail.com (Postfix) with ESMTP id CDDEB180014 for ; Tue, 4 Jul 2023 01:00:07 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Xdelt5iK; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf24.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688432408; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=wZmwLhXUybuDIWyIow74RTl/H75QKsJ9E1wkXb9Ip1E=; b=EY8e9rUg0sjkBxqrUYw9kSMN6ggcHPOaHZY1qMef/ZVH40LvJ/z3spm9WSs6oFu3PB+3WW 2McqyZtv4GpVGW1S4v1mkqIpsNQowoK/PAs5tudseIBbKulxhqhdJitcg7xId5YgeKB+GT qoDglY8hOWkSkV7MzR0pEGRqK5CCE6s= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Xdelt5iK; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf24.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688432408; a=rsa-sha256; cv=none; b=PdRNLr7dhZzdGUYYsL7yHLM9YUt4KjFLNJfh6aeDm/hnc4MCluizDAXxYwHhe1XdkJVK9V 01bpxLG/ygGFpN4KH1S44uCG6nFvgcZ8CrqFjIEXxHWPGXXlrFID881G3+9HIUpGik/u0v j4iPcN8ZqlIsAhTNDXGQ232xqwGKqYM= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7BF096006F; Tue, 4 Jul 2023 01:00:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F99AC433C8; Tue, 4 Jul 2023 01:00:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688432406; bh=MXEys2E3ebeRfuAMK0DK9Y1JAWgYItda1NlZ4Ml4tAY=; h=From:To:Cc:Subject:Date:From; b=Xdelt5iKzAzXP8FeIZ/EEjKyFuqIK/Y2AYQ0elzbE8cfG0jq1iouQYhwXdyQAP7FU niNKE23QECbXgkeryxZAS2RcJZomY8PdhNeQLm7kiCctbukYK6hasStvIXKW4iwfkJ 9tGG9JgHcoZUK9/K21ZFZjgljbrJ128ZrxHh+jNRWihHsaVxAHdkS6ZNcvWob8cQkR 1yLy2nEyj/Fe3g/Svv/Sr/bnVD4UYhoF7PlsTUugkL1/K542AgQjdUtkOwFDtfril+ 76IQ8wy50jMtjSDDYa20kpex9Cwq9A/ZTadtSaYVkd8bMDT33gd8eFqp7QEgN1gapw RUrcUyRJLKmTQ== From: SeongJae Park To: akpm@linux-foundation.org Cc: surenb@google.com, Liam.Howlett@oracle.com, torvalds@linux-foundation.org, catalin.marinas@arm.com, will@kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, SeongJae Park Subject: [PATCH] arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault() Date: Tue, 4 Jul 2023 01:00:03 +0000 Message-Id: <20230704010003.86352-1-sj@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CDDEB180014 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: w5pub8693g47iik3ztqadfos379wy4nu X-HE-Tag: 1688432407-78540 X-HE-Meta: U2FsdGVkX19OPrV5FlsoT+GMnD20EHLd7EUGTKc5Hebaxhw1wG4seRjqU4GaTwUk1RAxUi7fGG7pdD9Ab4vDI6DMbPeNQgzdJUhNbC/w7mS7MZAumy+2edWDtBoet+mWyg7UFU53QJ4dcnf1sZUTYBn6Ega6u+prt3/B6+JIG7Am9Va5aX4g28iTqM2ws80Qt5oSPXiFG3striaY5lB/WX13RmzeMxm7jQj4136TvRoflxP+01sA2+I/qNOfuE5ZqN2KjtgfiwB1R5IYz3VnQJuysW3IuqckDmwlryTGQVWfSUui+F6FxQoivOyjNf2X3pe02NOCtnXssoldNglv4sazKFpC7BMYJ+YFTkSS5YpwyFVgf+PIUU9PFnhBDkMDdCqouHM6vAHmrJP/WSxD984YEM0vqqPwfWPzg687q54oLQBboOBwX8hU8iYUq5oKMyP9ajuKJ62ub/c7gTXIoZrj4n6ZEVbyRJr25r7XH99a1OxFqondiXsBsbfBlc/GusCkPYj+A08WVyCY2zJelYRQwEfrx8qgcxVlLZqRir++pwFIJAsZjs1/zWveqS7+yK7moKSWwJuRTObVAGiguFCPwx5EtubK1QvBKmI7Cvmg+ZpR8nlA/pBXRie2ROFsu4isBenYxSu0nsJV2g4LediPTL2GlpQ+LOZ34RRa0B0Y2lkHKKrX2C5iEw2eeedck3d1zw9MHWkg9RRl6md1107NWMWEc0csdSonfPX9+OEgCs9jpuMDmzZJ1M9D6/PQglGRIJakgA5iXA9htw5zwwyGrjJBXEyzxKBVBd3JXQg6jT8fN/nCItB7upSTr+QRRHTBd91e1SrmCWFimNCj90B+NcA3Z5fa8y76LjxPj8KiUuqDayzFDYC1mAI5FR1rhCaio4lsgQoT6XSVFR3t+PDpsfntyDgYJdtm6LjoVKAxYGjoZWd0eGIe9LltE9TckUqMW5nYXWa9FBvwEGX +IigNjOs vZtG0bQ6hRCKjw4SCXPyGWht4BUfzaC49+hD94Y7AuCgdgNSDh0rQhSqSqOS11G2jHCK3BP/1kLPl+FCVB0AJpROlUSmlJQGRux5NOYiS8i2h2dYfeVFeUgz2+WFxJoSRSYF7hkSRU/hi74yYi+lqs7RUgl64YRqeergLR6b29iZF9erYGlcKlC2+XickCEfg/Yklv34tuHMM0WR9v8mvShVv5sT9Gd47/ZEm2Zon3Is0GwXpVkbaTzQIodO7Z4tf55GLiRNk6emQP18xI6oz/6/h4NSBw/L5tTJY2ZKzjxaY711obLGTfwDrT5i1mqOuawvvGOVWfVkOQpS1iiYop6qG2ZKgA47uUbHtUWilP7OBW7ln/0ANFlNHt1HvyTWaunHc X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Commit ae870a68b5d1 ("arm64/mm: Convert to using lock_mm_and_find_vma()") made do_page_fault() to use 'vma' even if CONFIG_PER_VMA_LOCK is not defined, but the declaration is still in the ifdef. As a result, building kernel without the config fails with undeclared variable error as below: arch/arm64/mm/fault.c: In function 'do_page_fault': arch/arm64/mm/fault.c:624:2: error: 'vma' undeclared (first use in this function); did you mean 'vmap'? 624 | vma = lock_mm_and_find_vma(mm, addr, regs); | ^~~ | vmap Fix it by moving the declaration out of the ifdef. Fixes: ae870a68b5d1 ("arm64/mm: Convert to using lock_mm_and_find_vma()") Signed-off-by: SeongJae Park --- arch/arm64/mm/fault.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 9d78ff78b0e3..b8c80f7b8a5f 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -536,9 +536,7 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, unsigned long vm_flags; unsigned int mm_flags = FAULT_FLAG_DEFAULT; unsigned long addr = untagged_addr(far); -#ifdef CONFIG_PER_VMA_LOCK struct vm_area_struct *vma; -#endif if (kprobe_page_fault(regs, esr)) return 0; -- 2.25.1