From: Alexander Duyck <alexander.duyck@gmail.com>
To: virtio-dev@lists.oasis-open.org, kvm@vger.kernel.org,
mst@redhat.com, catalin.marinas@arm.com, david@redhat.com,
dave.hansen@intel.com, linux-kernel@vger.kernel.org,
willy@infradead.org, mhocko@kernel.org, linux-mm@kvack.org,
akpm@linux-foundation.org, will@kernel.org,
linux-arm-kernel@lists.infradead.org, osalvador@suse.de
Cc: yang.zhang.wz@gmail.com, pagupta@redhat.com,
konrad.wilk@oracle.com, nitesh@redhat.com, riel@surriel.com,
lcapitulino@redhat.com, wei.w.wang@intel.com,
aarcange@redhat.com, ying.huang@intel.com, pbonzini@redhat.com,
dan.j.williams@intel.com, fengguang.wu@intel.com,
alexander.h.duyck@linux.intel.com,
kirill.shutemov@linux.intel.com
Subject: [PATCH v9 5/8] arm64: Move hugetlb related definitions out of pgtable.h to page-defs.h
Date: Sat, 07 Sep 2019 10:25:45 -0700 [thread overview]
Message-ID: <20190907172545.10910.88045.stgit@localhost.localdomain> (raw)
In-Reply-To: <20190907172225.10910.34302.stgit@localhost.localdomain>
From: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Move the static definition for things such as HUGETLB_PAGE_ORDER out of
asm/pgtable.h and place it in page-defs.h. By doing this the includes
become much easier to deal with as currently arm64 is the only architecture
that didn't include this definition in the asm/page.h file or a file
included by it.
It also makes logical sense as PAGE_SHIFT was already defined in
page-defs.h so now we also have HPAGE_SHIFT defined there as well.
Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
---
arch/arm64/include/asm/page-def.h | 9 +++++++++
arch/arm64/include/asm/pgtable.h | 9 ---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/include/asm/page-def.h b/arch/arm64/include/asm/page-def.h
index f99d48ecbeef..1c5b079e2482 100644
--- a/arch/arm64/include/asm/page-def.h
+++ b/arch/arm64/include/asm/page-def.h
@@ -20,4 +20,13 @@
#define CONT_SIZE (_AC(1, UL) << (CONT_SHIFT + PAGE_SHIFT))
#define CONT_MASK (~(CONT_SIZE-1))
+/*
+ * Hugetlb definitions.
+ */
+#define HUGE_MAX_HSTATE 4
+#define HPAGE_SHIFT PMD_SHIFT
+#define HPAGE_SIZE (_AC(1, UL) << HPAGE_SHIFT)
+#define HPAGE_MASK (~(HPAGE_SIZE - 1))
+#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
+
#endif /* __ASM_PAGE_DEF_H */
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index 7576df00eb50..06a376de9bd6 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -305,15 +305,6 @@ static inline int pte_same(pte_t pte_a, pte_t pte_b)
*/
#define pte_mkhuge(pte) (__pte(pte_val(pte) & ~PTE_TABLE_BIT))
-/*
- * Hugetlb definitions.
- */
-#define HUGE_MAX_HSTATE 4
-#define HPAGE_SHIFT PMD_SHIFT
-#define HPAGE_SIZE (_AC(1, UL) << HPAGE_SHIFT)
-#define HPAGE_MASK (~(HPAGE_SIZE - 1))
-#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
-
static inline pte_t pgd_pte(pgd_t pgd)
{
return __pte(pgd_val(pgd));
next prev parent reply other threads:[~2019-09-07 17:25 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-07 17:25 [PATCH v9 0/8] stg mail -e --version=v9 \ Alexander Duyck
2019-09-07 17:25 ` [PATCH v9 1/8] mm: Add per-cpu logic to page shuffling Alexander Duyck
2019-09-09 8:14 ` David Hildenbrand
2019-09-09 15:11 ` Alexander Duyck
2019-09-10 12:11 ` Michal Hocko
2019-09-10 22:14 ` Alexander Duyck
2019-09-10 22:11 ` Alexander Duyck
2019-09-09 9:07 ` Kirill A. Shutemov
2019-09-09 15:12 ` Alexander Duyck
2019-09-07 17:25 ` [PATCH v9 2/8] mm: Adjust shuffle code to allow for future coalescing Alexander Duyck
2019-09-09 8:19 ` David Hildenbrand
2019-09-09 9:47 ` Kirill A. Shutemov
2019-09-09 15:22 ` Alexander Duyck
2019-09-09 15:35 ` Kirill A. Shutemov
2019-09-09 15:37 ` Alexander Duyck
2019-09-09 16:43 ` Alexander Duyck
2019-09-09 17:00 ` Kirill A. Shutemov
2019-09-10 12:20 ` Michal Hocko
2019-09-10 14:48 ` Alexander Duyck
2019-09-07 17:25 ` [PATCH v9 3/8] mm: Move set/get_pcppage_migratetype to mmzone.h Alexander Duyck
2019-09-09 8:22 ` David Hildenbrand
2019-09-09 9:56 ` Kirill A. Shutemov
2019-09-09 18:01 ` Alexander Duyck
2019-09-09 18:12 ` Alexander Duyck
2019-09-10 12:23 ` Michal Hocko
2019-09-10 14:46 ` Alexander Duyck
2019-09-10 17:45 ` Michal Hocko
2019-09-10 20:26 ` Alexander Duyck
2019-09-07 17:25 ` [PATCH v9 4/8] mm: Use zone and order instead of free area in free_list manipulators Alexander Duyck
2019-09-10 12:27 ` Michal Hocko
2019-09-07 17:25 ` Alexander Duyck [this message]
2019-09-09 8:52 ` [PATCH v9 5/8] arm64: Move hugetlb related definitions out of pgtable.h to page-defs.h David Hildenbrand
2019-09-09 15:27 ` Alexander Duyck
2019-09-17 17:48 ` Will Deacon
2019-09-17 20:07 ` Alexander Duyck
2019-09-07 17:25 ` [PATCH v9 6/8] mm: Introduce Reported pages Alexander Duyck
2019-09-09 14:42 ` Kirill A. Shutemov
2019-09-09 16:25 ` Alexander Duyck
2019-09-09 16:33 ` Kirill A. Shutemov
2019-09-07 17:26 ` [PATCH v9 7/8] virtio-balloon: Pull page poisoning config out of free page hinting Alexander Duyck
2019-09-09 8:59 ` David Hildenbrand
2019-09-09 15:31 ` Alexander Duyck
2019-09-07 17:26 ` [PATCH v9 8/8] virtio-balloon: Add support for providing unused page reports to host Alexander Duyck
2019-09-07 17:34 ` [PATCH v9 0/8] mm / virtio: Provide support for unused page reporting Alexander Duyck
2019-09-10 12:42 ` [PATCH v9 0/8] stg mail -e --version=v9 \ Michal Hocko
2019-09-10 14:42 ` Alexander Duyck
2019-09-10 14:47 ` Michal Hocko
2019-09-10 16:05 ` Alexander Duyck
2019-09-10 16:18 ` [virtio-dev] " Dr. David Alan Gilbert
2019-09-10 16:22 ` David Hildenbrand
2019-09-11 9:23 ` Michael S. Tsirkin
2019-09-11 9:50 ` David Hildenbrand
2019-09-10 17:52 ` Michal Hocko
2019-09-10 18:00 ` Michal Hocko
2019-09-10 20:37 ` Alexander Duyck
2019-09-10 21:23 ` Alexander Duyck
2019-09-11 11:36 ` Michal Hocko
2019-09-11 11:47 ` David Hildenbrand
2019-09-11 12:08 ` Michael S. Tsirkin
2019-09-11 12:19 ` Michal Hocko
2019-09-11 12:25 ` Michal Hocko
2019-09-11 12:42 ` David Hildenbrand
2019-09-11 12:54 ` Michal Hocko
2019-09-11 13:03 ` David Hildenbrand
2019-09-11 13:20 ` Michal Hocko
2019-09-11 13:51 ` Michal Hocko
2019-09-11 16:09 ` David Hildenbrand
2019-09-12 7:16 ` Michal Hocko
2019-09-12 7:47 ` David Hildenbrand
2019-09-12 9:26 ` Michal Hocko
2019-09-12 12:00 ` Nitesh Narayan Lal
2019-09-11 14:03 ` Nitesh Narayan Lal
2019-09-11 16:02 ` David Hildenbrand
2019-09-11 13:19 ` Nitesh Narayan Lal
2019-09-11 12:55 ` Nitesh Narayan Lal
2019-09-11 15:12 ` Alexander Duyck
2019-09-12 9:19 ` Michal Hocko
2019-09-12 10:24 ` Kirill A. Shutemov
2019-09-12 11:11 ` Michal Hocko
2019-09-12 15:42 ` Alexander Duyck
2019-09-12 16:35 ` Mel Gorman
2019-09-12 17:48 ` Alexander Duyck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190907172545.10910.88045.stgit@localhost.localdomain \
--to=alexander.duyck@gmail.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=alexander.h.duyck@linux.intel.com \
--cc=catalin.marinas@arm.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@intel.com \
--cc=david@redhat.com \
--cc=fengguang.wu@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=konrad.wilk@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=lcapitulino@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=mst@redhat.com \
--cc=nitesh@redhat.com \
--cc=osalvador@suse.de \
--cc=pagupta@redhat.com \
--cc=pbonzini@redhat.com \
--cc=riel@surriel.com \
--cc=virtio-dev@lists.oasis-open.org \
--cc=wei.w.wang@intel.com \
--cc=will@kernel.org \
--cc=willy@infradead.org \
--cc=yang.zhang.wz@gmail.com \
--cc=ying.huang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).