From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4F3D3563EB for ; Wed, 8 Jul 2026 03:11:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783480308; cv=none; b=JNL78iGojXL6NzYcwMwZZvHJC94iY4JtFDAnR3hHgR3WGHb/w/fUoQ78JVAoMEgsxouzjzpHIIs1+DrKvZrlkdr8qoJtdwNRcOw9UzmKGWhXa4bBe50PsrbrgmkUid3LuPKmKuWxI1hxqF/gLNXPIx0ydnhcA3NosWy0xsIcr8Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783480308; c=relaxed/simple; bh=CTC1TyAkPrIQFc38KE/W0hHvvsUCQ9GaD5mg4gxi7so=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=cg3rvoM6U79icGY6bNlW/3gdCvJ5xC5SiV/3cRorsui/tKkVqZ6qhdhSJoW+EqrKy10Frbrla1o34tTeNJ049+9DkkOIeNKhAEDBgCiouUv8Xhm+Xih8j81WZXOccSr3jV5ut7Fm9e9K8aU7xXomxzq5bwphropNrd1Ij/B+3Ao= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jthoughton.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=bdD7DE3M; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jthoughton.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bdD7DE3M" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-847ad67cc51so229747b3a.3 for ; Tue, 07 Jul 2026 20:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1783480306; x=1784085106; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=9tYhyFlDTzE/YH6OeWF1FZ4zpUrrudSRzFbgqClNVeE=; b=bdD7DE3MXEGNkYGhhob0W+Y0QV5iMX+tfAZ3+r7Dexd0N813+hfp0mX7c4yZaCatYn XSUeM5kGyklfjeVmbjfSSuOyxvGzmX0sPoh1Q/Lhx4/Zi0mb7AsRy5hXD4/KU77Qy8St vKF6XJEDU8WPZDzWM2Let/Fv2UbUxQD1elcwcUJwgyLp/1XYtJiT0hzQ9dRuq3sDhgdz pe/4Sqq0jIV3u1Z8VwA1TJDWuAu1TE6sGlxWM08g8HWV4cm/JJACDNdrLr0OqDPyoo89 XjJys+0HvDOtaM4yxS0eP1Att3e8B6zWT/JD8H26Ugo5XW/4BJHEwU/OzXG833zI3HvT jqzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783480306; x=1784085106; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9tYhyFlDTzE/YH6OeWF1FZ4zpUrrudSRzFbgqClNVeE=; b=Cpnxoh8yRjV5oqulGUvlYjX/z5ttht8mAx4BHviKwNmcKZZpy6tkZaWDm2dBX/yw/T rjYjJnFaA1HVX5n6tKECY7ugqTUOmpFKT/Su7eaHt+Z4c3FYpok7a1pWiD6Qp1M+Z2w4 hhbN2458r540YuDlaAu9UWb2oV2x0QDmW3daJXGs3ovlivXkc010OtVVlIGH7BXuemL1 kfUqCK8SIASzPt8GzOC5WB+1RzTS7m4X7p7j5prq2ma+4U4lR5qBA8Dv6aTAp3ooTx+i YHmQXtm8aLzz6QM7STBkKidN9osmPlnetb7y+Jumh0HUYEbFmyyLHc3xzbnnvJzq1JyL lYoA== X-Forwarded-Encrypted: i=1; AHgh+RqEewshY0ITbouddgJThTLlV/sT+9pkdwTayOkLD8Mt/S6A3YgJwVAnwvED3Ee3dd2Ca0LEDvTO1Dz2OQw=@vger.kernel.org X-Gm-Message-State: AOJu0YxcS5Q/+BIHPAJ0B59am4eJZZJ/xOMuQBjER8NL4qFvmbZryIz3 oetmSh5y8IeftTq7w270yvhV06UqhffgWKG+tA051V1TZH0zPQ02J5d3GNde4Sbc+1i1AULWykR 7HnlXMA9WHrJeQuX88PffDg== X-Received: from pfx50.prod.google.com ([2002:a05:6a00:a472:b0:846:f544:63be]) (user=jthoughton job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2294:b0:845:388b:56f with SMTP id d2e1a72fcca58-84842f9f250mr639122b3a.40.1783480305691; Tue, 07 Jul 2026 20:11:45 -0700 (PDT) Date: Wed, 8 Jul 2026 03:11:24 +0000 In-Reply-To: <20260708031129.3503195-1-jthoughton@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260708031129.3503195-1-jthoughton@google.com> X-Mailer: git-send-email 2.55.0.795.g602f6c329a-goog Message-ID: <20260708031129.3503195-15-jthoughton@google.com> Subject: [PATCH 14/18] hugetlb_vmemmap: Rename mm/hugetlb_vmemmap.h to mm/hugetlb_vmemmap_internal.h From: James Houghton To: Will Deacon , Catalin Marinas , Muchun Song , Oscar Salvador Cc: Nikos Nikoleris , Linu Cherian , Mark Rutland , David Hildenbrand , Andrew Morton , Ryan Roberts , Nanyong Sun , Yu Zhao , Frank van der Linden , David Rientjes , James Houghton , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" This avoids the confusion with the new header that will be added in late commit, at include/linux/hugetlb_vmemmap.h. The file rename in this patch isn't really required, but the header guard (now named _MM_HUGETLB_VMEMMAP_INTERNAL_H) does need a rename. Signed-off-by: James Houghton --- MAINTAINERS | 2 +- mm/hugetlb.c | 2 +- mm/hugetlb_sysfs.c | 2 +- mm/hugetlb_vmemmap.c | 4 ++-- mm/{hugetlb_vmemmap.h => hugetlb_vmemmap_internal.h} | 6 +++--- mm/sparse-vmemmap.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename mm/{hugetlb_vmemmap.h => hugetlb_vmemmap_internal.h} (95%) diff --git a/MAINTAINERS b/MAINTAINERS index f37a81950e25..ff47013ce995 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12021,7 +12021,7 @@ F: mm/hugetlb_cma.h F: mm/hugetlb_sysctl.c F: mm/hugetlb_sysfs.c F: mm/hugetlb_vmemmap.c -F: mm/hugetlb_vmemmap.h +F: mm/hugetlb_vmemmap_internal.h F: tools/testing/selftests/cgroup/test_hugetlb_memcg.c HVA ST MEDIA DRIVER diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 571212b80835..298673a6c57c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -47,7 +47,7 @@ #include #include #include "internal.h" -#include "hugetlb_vmemmap.h" +#include "hugetlb_vmemmap_internal.h" #include "hugetlb_cma.h" #include "hugetlb_internal.h" #include diff --git a/mm/hugetlb_sysfs.c b/mm/hugetlb_sysfs.c index 79ece91406bf..83a95f5142f5 100644 --- a/mm/hugetlb_sysfs.c +++ b/mm/hugetlb_sysfs.c @@ -8,7 +8,7 @@ #include #include -#include "hugetlb_vmemmap.h" +#include "hugetlb_vmemmap_internal.h" #include "hugetlb_internal.h" #define HSTATE_ATTR_RO(_name) \ diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index b445febac0d2..a490a34998d9 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -16,10 +16,10 @@ #include #include #include +#include -#include "linux/hugetlb.h" #include -#include "hugetlb_vmemmap.h" +#include "hugetlb_vmemmap_internal.h" #include "internal.h" /** diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap_internal.h similarity index 95% rename from mm/hugetlb_vmemmap.h rename to mm/hugetlb_vmemmap_internal.h index 18b490825215..6b28780014bc 100644 --- a/mm/hugetlb_vmemmap.h +++ b/mm/hugetlb_vmemmap_internal.h @@ -6,8 +6,8 @@ * * Author: Muchun Song */ -#ifndef _LINUX_HUGETLB_VMEMMAP_H -#define _LINUX_HUGETLB_VMEMMAP_H +#ifndef _MM_HUGETLB_VMEMMAP_INTERNAL_H +#define _MM_HUGETLB_VMEMMAP_INTERNAL_H #include #include #include @@ -95,4 +95,4 @@ static inline bool hugetlb_vmemmap_optimizable(const struct hstate *h) { return hugetlb_vmemmap_optimizable_size(h) != 0; } -#endif /* _LINUX_HUGETLB_VMEMMAP_H */ +#endif /* _MM_HUGETLB_VMEMMAP_INTERNAL_H */ diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 99e2be39671b..94d5da9f8ab7 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -32,7 +32,7 @@ #include #include -#include "hugetlb_vmemmap.h" +#include "hugetlb_vmemmap_internal.h" /* * Flags for vmemmap_populate_range and friends. -- 2.55.0.795.g602f6c329a-goog