From nobody Wed Jun 17 07:22:46 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D3703B531B for ; Mon, 27 Apr 2026 10:58:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777287501; cv=none; b=OtVBxNPFparTAxcHg1xFMH9BwfZ68kl+pw9B1ijGakSNtm5y8X4iD7FDBfuKXZ3RSvmuRkVrbwRswL6JML832VGjfo2Ohx5iQsBw9/Sdvpz2u46kMlPzkMPVdiWcASciPsUQKcqvmHBV7P1xk52ziK57upS0+3WeP7sG5NQUGBY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777287501; c=relaxed/simple; bh=dyPAr09lWlR/RQ4fkkDMb+zOF+584aQzExR/1zdUeaY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=VpE+a45pEuzL4DB8LmNfHnI932gTydGc2vtSqijMcit70xCQPCBNvbfyu0Xz5e5dq7lA9pCxFIq+xjX8zx3Qff405qNAU+QzNndx4iEONo2OXMWMowQIdZAO9qaRkedQERjWGd+iR7YP4C3RCkT4TwK2d9Kpd1aieJ5I0PnYMhU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=FyWEH9gs; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=D1s8Xz9x; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FyWEH9gs"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="D1s8Xz9x" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777287498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=wclsbCz45VsM77RlQTKKMaoJPnWAhWJRZZhkjEMod8Q=; b=FyWEH9gs7ldCaB8au9KWwtfoPp3CdLKpClLPcdYznkusOiIe+7z+evc1c5EJ5xbozKb6dO AimxwNrs74/rwiqB8X67VBOvPlD6Ff9YqTduLpRlYtvy3sqC5ZEk3mDfqJdERpwLYAjBcC Hy3Riood0KAtPSgIxc4AGo4Z78b+Pog= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-607-TkJSzLz-NAK_cdamqUwR_A-1; Mon, 27 Apr 2026 06:58:17 -0400 X-MC-Unique: TkJSzLz-NAK_cdamqUwR_A-1 X-Mimecast-MFC-AGG-ID: TkJSzLz-NAK_cdamqUwR_A_1777287497 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-50edf01172bso195132741cf.2 for ; Mon, 27 Apr 2026 03:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1777287496; x=1777892296; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=wclsbCz45VsM77RlQTKKMaoJPnWAhWJRZZhkjEMod8Q=; b=D1s8Xz9x0iQEukKt8sQruQ54592rdG6R/iRx+F5Hby/KcQlWaMton+911Z740S5Jtb SqCizu1NFviFekUpAdvWwA4XShc2fokY+CG5kMt+sFGttChTIDT4A4TvyzxTc+CP91Pg Ex7ePLT9LCWbuimzp57Mb0qihzXKMGJ/yQICGPhtE54URE1LRiWxo3oufSMAfGhhXrcN YEO0XBqCGtqSXQ8VDugZUWA9P9CGE6w5kFn6++pYZWaNeqE3MMCIjcOzOFx4AoPAvi0J KHnT7r/hCD/gySMZOvjO6DF1p5hh6lW49dUlmCt99m40CYO2YnaB9HEfO6TsreqHbBoQ Jmvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777287496; x=1777892296; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wclsbCz45VsM77RlQTKKMaoJPnWAhWJRZZhkjEMod8Q=; b=qDp4ozUus/xSgx7BHE/1Tl/E81eb8dr/YYD7N8hvDntUGsijJ9sp+76BWeNGHNil51 SsqkeIeeUHhB51KZuhgFZLTA5ir2DkICnThWD1vj70y1sNdi89s65vksa+4mSIxBogy8 SRe2H+LYrHhJbBPWTwAgW/StdO7hrGWzJ1OIiWusGZIAPy9HNAfeG/mdhKuB+K9JQE3U V+VRzp68grWs9xCGRnQnPVUVM+CqsTMoI7gdiv4EWcOpegLFXgJPrKxm1+NEBHB8OCGL bM0rEGDshrLjEo8fYSmDq4PwkFoBPyG5P9uVDl9Gg5oDK2WMuwu1i9xobbS6NUTxHpVC mJDw== X-Gm-Message-State: AOJu0YxDzR6CY1W7VXKxp4poTuH8jot1MADJ6huIJEwdZRbjG1WF56Ii DQmcNh7XCFmdqmNvT7Gusy4LppSjOYeYVKyLGZ3mAwceEB0VnM6MAmAlqpXf1r+VXig7mBHpd1n 78zTLXRgBfMc/S2DIZbw54XuPeLNZxkEZ44DHPyNQoKaXQ7HVO/KBmcDuJSIuWQxZkweWpwyI64 WSbBD1JgIDGkzlBtUthzccQVbIcvNFJH1tYtY2LvwU9+/qyv2lAA== X-Gm-Gg: AeBDiesfuzvhLPt3+iLOX0JTCd2DXzMp4kMNUnZxiTeOv9cx//pqZXSbaeD+A5V0cTl 8HRFRr9aNM+BpXpcW2Rpmv6klJ2qbqhxUZw7lPBuCcLf9vWkUzqa0qCoWMYWzqt/EpdD6DRmSJG Kf6xx//VkC8HLfpc5qnWJA1ZC7T/VyKw4I++1SOy2rvC6xe7+O9F4P0f9Xa+ViFXMhYG+ynyX5h LWysHxQUGJjBQQypQUDFjCjNPAHcXUMAhewqWTJDZkxDBbQDPYCvlr/EsuNXQbSyRLyrXzfrb7Q b/jYPKEPwoplBKQEgq06kvs7JzpOJnrY9WrqqrtHzid5pq272LETWNGZfjZNsm3qkBRa3++KTn3 g12WOW3LF5OR//Demm3Fg746l6/0DCOu/ire4QV9sHB4VbHh5QyawZQ1QaNLOgoGV31R28vvVgH 4SX0bD50dq2LYYpjvIjY5qBPOT/ofRiBFuyCk= X-Received: by 2002:ac8:7d56:0:b0:50e:ca38:e219 with SMTP id d75a77b69052e-50eca390557mr474867781cf.45.1777287495993; Mon, 27 Apr 2026 03:58:15 -0700 (PDT) X-Received: by 2002:ac8:7d56:0:b0:50e:ca38:e219 with SMTP id d75a77b69052e-50eca390557mr474867401cf.45.1777287495453; Mon, 27 Apr 2026 03:58:15 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50e39495192sm263471871cf.27.2026.04.27.03.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 03:58:14 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: linux-mm@kvack.org, linux-m68k@lists.linux-m68k.org, "David Hildenbrand (Arm)" , Geert Uytterhoeven Subject: [PATCH] mm_types: remove references to s390 gmap Date: Mon, 27 Apr 2026 12:58:10 +0200 Message-ID: <20260427105810.23761-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" s390 does not anymore use special struct page for its shadow page tables. The honor of giving a special meaning to pt_index is now m68k's, so rename the fields and adjust them for the desired type. Cc: linux-mm@kvack.org Cc: linux-m68k@lists.linux-m68k.org Cc: David Hildenbrand (Arm) Cc: Geert Uytterhoeven Signed-off-by: Paolo Bonzini Acked-by: David Hildenbrand (Arm) Acked-by: Geert Uytterhoeven # m68k Acked-by: Vishal Moola --- Compile-tested only. arch/m68k/mm/motorola.c | 2 +- include/linux/mm_types.h | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index b30aa69a73a6..67e8a2cf4c41 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c @@ -105,7 +105,7 @@ static struct list_head ptable_list[3] =3D { =20 #define PD_PTABLE(ptdesc) ((ptable_desc *)&(virt_to_ptdesc((void *)(ptdesc= ))->pt_list)) #define PD_PTDESC(ptable) (list_entry(ptable, struct ptdesc, pt_list)) -#define PD_MARKBITS(dp) (*(unsigned int *)&PD_PTDESC(dp)->pt_index) +#define PD_MARKBITS(dp) (PD_PTDESC(dp)->pt_markbits) =20 static const int ptable_shift[3] =3D { 7+2, /* PGD */ diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index a308e2c23b82..9e4dbcddaf33 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -550,13 +550,12 @@ FOLIO_MATCH(compound_info, _head_3); * struct ptdesc - Memory descriptor for page tables. * @pt_flags: enum pt_flags plus zone/node/section. * @pt_rcu_head: For freeing page table pages. - * @pt_list: List of used page tables. Used for s390 gmap shadow = pages - * (which are not linked into the user page tables) and= x86 - * pgds. + * @pt_list: List of used page tables. Used by m68k pointer tables + * and x86 pgds. * @_pt_pad_1: Padding that aliases with page's compound head. * @pmd_huge_pte: Protected by ptdesc->ptl, used for THPs. * @__page_mapping: Aliases with page->mapping. Unused for page tables. - * @pt_index: Used for s390 gmap. + * @pt_markbits: Used for m68k pointer tables. * @pt_mm: Used for x86 pgds. * @pt_frag_refcount: For fragmented page table tracking. Powerpc only. * @pt_share_count: Used for HugeTLB PMD page table share count. @@ -583,7 +582,7 @@ struct ptdesc { unsigned long __page_mapping; =20 union { - pgoff_t pt_index; + unsigned int pt_markbits; struct mm_struct *pt_mm; atomic_t pt_frag_refcount; #ifdef CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING @@ -612,7 +611,7 @@ TABLE_MATCH(flags, pt_flags); TABLE_MATCH(compound_info, pt_list); TABLE_MATCH(compound_info, _pt_pad_1); TABLE_MATCH(mapping, __page_mapping); -TABLE_MATCH(__folio_index, pt_index); +TABLE_MATCH(__folio_index, pt_markbits); TABLE_MATCH(rcu_head, pt_rcu_head); TABLE_MATCH(page_type, __page_type); TABLE_MATCH(_refcount, __page_refcount); --=20 2.53.0