Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2894609pxb; Tue, 24 Aug 2021 10:03:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJ+7vGOwqFNxsn6ohxJQGz9WquF/muw2ro7Oal3FNg4PWaEFRFIg6twwAtdbePx2C0oKk6 X-Received: by 2002:a6b:c80f:: with SMTP id y15mr32241280iof.80.1629824604435; Tue, 24 Aug 2021 10:03:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629824604; cv=none; d=google.com; s=arc-20160816; b=XhjREP0Qovs5VnWDMirvR9N+IySauPb09Mu+j/PnHLilY9mj1KqosdfterSiC2PvP/ MdOqZkC1ROJGtCMlmoSM/SpC3bv4w5w/fxb2F3qKfnLVY+xJdHQ1WOBf99SGzAsUxJFJ wzNxbH9r4wcBwZrwZitsu72vKwcTsSDks4v8ROoExQvBbBc0l6X+kAls7kQrqdDMcrYQ KGA4S7dFoZpfuJj6zHHXsBLeh14Ye607alp/EoX94RNYA1OqGq6bteBIZQ+tFkeWLa2C k9fCqxVE2lm2wHnSr1UWjjinTV8DrFKSff5w8oVZkvmg8FgoW+hz7AJQp0mKUJTxP7sG ZgXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6YHhy3hGjbf0jGgD971o7dfjoDs4eIctqu2QmnRl7hA=; b=YVwvRY38vV1geMztD7g+J/5jc0upK/8IK/8l2l/vweVKJSI04eYu8SJ5M3zBeFWpfO sWeHUOVudl8qBcBfY9+YxDOErPdJ0Q/Ej3A+9DcUoqj5TgjBNBLZLOcAOSvPjY1xZHIZ lC+v3pQrRJNRd9lHBRwHaEn3E0a1bGSSUW0gpGRMJnvEpnEmXsJGHkWjOnTdRXrsifZ2 ufH/KKe7rubHGCCA5zavMB9uon9emm0puFMe7o6mSlOEdOVK/T86ngFbYn071JTLgwOG t9fuTBz6p54hApm4aoLvpZJKV0NUKJe9i+qJ5qcLSm8mXiI0TwR/nBsSJVuKxEd5w7pS ZzyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mx6hXWQa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f10si14837239ilk.8.2021.08.24.10.03.00; Tue, 24 Aug 2021 10:03:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mx6hXWQa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235098AbhHXRDB (ORCPT + 99 others); Tue, 24 Aug 2021 13:03:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:39458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239152AbhHXQ74 (ORCPT ); Tue, 24 Aug 2021 12:59:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BF68E613CD; Tue, 24 Aug 2021 16:57:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824258; bh=2Pn+Mp4FVPMb6fWNViq2NqcBXn4g6e17Pw+se5gNxRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mx6hXWQaumNdqDOb9LgEwFVqvIJo07l54vviy4qpCTK5gP9TnCiV5gdWpAl2KFRHp mpXtwcenswIeBvfQ1UyZARRbrgyRJ8KOOOU4Q6MFq72/PfUPiswyb3HaP9Nmkz8X7i pM3MOjFNilrJ6Az8/HboOTmhUxLRj+js94hLQbqh5/Hfo8X2pi6wjwyRqUedtInADg etSy/hEp5gPVNFXMYBGglE1O03QoL6/YZgz3aDDXSuG0C737dBCBAYxTUcXSv/hKo9 DTSnepPNEnNklyuOaiojaDG2MfN5uc7rc7YesN6KTdoDDes0AKryMSFsIod+1vhnuZ Ung9XGBQrzLEw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrew Delgadillo , Will Deacon , Sasha Levin Subject: [PATCH 5.13 091/127] arm64: clean vdso & vdso32 files Date: Tue, 24 Aug 2021 12:55:31 -0400 Message-Id: <20210824165607.709387-92-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824165607.709387-1-sashal@kernel.org> References: <20210824165607.709387-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.13.13-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.13.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.13.13-rc1 X-KernelTest-Deadline: 2021-08-26T16:55+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Delgadillo [ Upstream commit 017f5fb9ce793e3558db94ee72068622bc0b79db ] commit a5b8ca97fbf8 ("arm64: do not descend to vdso directories twice") changes the cleaning behavior of arm64's vdso files, in that vdso.lds, vdso.so, and vdso.so.dbg are not removed upon a 'make clean/mrproper': $ make defconfig ARCH=arm64 $ make ARCH=arm64 $ make mrproper ARCH=arm64 $ git clean -nxdf Would remove arch/arm64/kernel/vdso/vdso.lds Would remove arch/arm64/kernel/vdso/vdso.so Would remove arch/arm64/kernel/vdso/vdso.so.dbg To remedy this, manually descend into arch/arm64/kernel/vdso upon cleaning. After this commit: $ make defconfig ARCH=arm64 $ make ARCH=arm64 $ make mrproper ARCH=arm64 $ git clean -nxdf Similar results are obtained for the vdso32 equivalent. Signed-off-by: Andrew Delgadillo Cc: stable@vger.kernel.org Fixes: a5b8ca97fbf8 ("arm64: do not descend to vdso directories twice") Link: https://lore.kernel.org/r/20210810231755.1743524-1-adelg@google.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index b52481f0605d..02997b253dee 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -181,6 +181,8 @@ archprepare: # We use MRPROPER_FILES and CLEAN_FILES now archclean: $(Q)$(MAKE) $(clean)=$(boot) + $(Q)$(MAKE) $(clean)=arch/arm64/kernel/vdso + $(Q)$(MAKE) $(clean)=arch/arm64/kernel/vdso32 ifeq ($(KBUILD_EXTMOD),) # We need to generate vdso-offsets.h before compiling certain files in kernel/. -- 2.30.2