From patchwork Mon Oct 14 03:03:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 13834116 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F9DCCF259D for ; Mon, 14 Oct 2024 03:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=rPWNnRQiSqjkFtkd3ZlbeGElr4t1vBhj9P7kgspNttw=; b=Y3IGX32W/OEJ3gLf5qKpi8kIK1 kpK3wLBzPJp3WvHclu8mD/6R/NSl5IQTYMMWXQc8MCadchuayZ8Ir2QXUwYeKyOwul3lauc5O4/+O l2yt8ONdBQTNVMEGJHGj+QVZdl9DcmVRRWEErixQt9u/0ttP7gJIjDVSDjnB/k8q1ykBmyXJI9FXx hhZ+/xkb5TeEfV1Lp6ucMXMMjgJ2a2olPWsfpCL7GVaVckLHS1R8TkeXDQ8hM1LEgRyVh7YOCuYHc cQcuRBP/wympkFVFFlXwHpdlc2WFg0HOTftjNh85VIjgQMLvWtOnF/hR1JnGCA+Cg9F8cMINHr3Ah xU+3rBhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t0BOl-00000003alf-3oYM; Mon, 14 Oct 2024 03:05:31 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t0BNN-00000003adp-1fh4 for linux-arm-kernel@lists.infradead.org; Mon, 14 Oct 2024 03:04:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728875043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rPWNnRQiSqjkFtkd3ZlbeGElr4t1vBhj9P7kgspNttw=; b=BWE5TSKvhU63O+BHOCpJXOxFoN1G/IstE8sYue4Ccfw8Fb9BAHCM3H0w/mIfTR/pu69lw3 zCefPUjsfj137DaysLzl76wd2HBsnSUsv/AaixCuKrdPN3D0mNVjaOZRRZscrGF9GSRHDT F4YF5fF512i4C8kzgWPGUMm1/HVBe6Y= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-180-SVb_aXQROFSzZZDUSKcmjg-1; Sun, 13 Oct 2024 23:04:02 -0400 X-MC-Unique: SVb_aXQROFSzZZDUSKcmjg-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 755D11956095; Mon, 14 Oct 2024 03:03:55 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.remote.csb (unknown [10.64.136.10]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 371481956052; Mon, 14 Oct 2024 03:03:50 +0000 (UTC) From: Gavin Shan To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will@kernel.org, ardb@kernel.org, anshuman.khandual@arm.com, gshan@redhat.com, shan.gavin@gmail.com Subject: [PATCH] arm64: head: Drop SWAPPER_TABLE_SHIFT Date: Mon, 14 Oct 2024 13:03:41 +1000 Message-ID: <20241014030341.995806-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241013_200405_538539_6403D5C0 X-CRM114-Status: UNSURE ( 9.08 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There is no users of SWAPPER_TABLE_SHIFT after commit 84b04d3e6bdb ("arm64: kernel: Create initial ID map from C code"). Just drop it. Signed-off-by: Gavin Shan Reviewed-by: Anshuman Khandual --- arch/arm64/include/asm/kernel-pgtable.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/include/asm/kernel-pgtable.h b/arch/arm64/include/asm/kernel-pgtable.h index bf05a77873a4..fd5a08450b12 100644 --- a/arch/arm64/include/asm/kernel-pgtable.h +++ b/arch/arm64/include/asm/kernel-pgtable.h @@ -26,7 +26,6 @@ #define SWAPPER_SKIP_LEVEL 0 #endif #define SWAPPER_BLOCK_SIZE (UL(1) << SWAPPER_BLOCK_SHIFT) -#define SWAPPER_TABLE_SHIFT (SWAPPER_BLOCK_SHIFT + PAGE_SHIFT - 3) #define SWAPPER_PGTABLE_LEVELS (CONFIG_PGTABLE_LEVELS - SWAPPER_SKIP_LEVEL) #define INIT_IDMAP_PGTABLE_LEVELS (IDMAP_LEVELS - SWAPPER_SKIP_LEVEL)