--- v5
+++ v3
@@ -3,16 +3,14 @@
don't need to support hugepd there. For everything else hugepd
is supported and pmd_huge is (0).
-Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
- arch/powerpc/include/asm/book3s/64/hash-4k.h | 31 ++++++++++++
- arch/powerpc/include/asm/book3s/64/hash-64k.h | 51 +++++++++++++++++++
- arch/powerpc/include/asm/nohash/pgtable.h | 25 ++++++++++
- arch/powerpc/include/asm/page.h | 42 ++--------------
- arch/powerpc/mm/hugetlbpage-hash64.c | 18 +++++++
- arch/powerpc/mm/hugetlbpage.c | 72 ---------------------------
- 6 files changed, 129 insertions(+), 110 deletions(-)
+ arch/powerpc/include/asm/book3s/64/hash-4k.h | 31 +++++++++++++++
+ arch/powerpc/include/asm/book3s/64/hash-64k.h | 51 +++++++++++++++++++++++++
+ arch/powerpc/include/asm/nohash/pgtable.h | 25 +++++++++++++
+ arch/powerpc/include/asm/page.h | 42 ++-------------------
+ arch/powerpc/mm/hugetlbpage.c | 54 ---------------------------
+ 5 files changed, 111 insertions(+), 92 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/64/hash-4k.h b/arch/powerpc/include/asm/book3s/64/hash-4k.h
index 75e8b9326e4b..b4d25529d179 100644
@@ -207,37 +205,11 @@
#define __hugepd(x) ((hugepd_t) { (x) })
struct page;
-diff --git a/arch/powerpc/mm/hugetlbpage-hash64.c b/arch/powerpc/mm/hugetlbpage-hash64.c
-index 0734e4daffef..e2138c7ae70f 100644
---- a/arch/powerpc/mm/hugetlbpage-hash64.c
-+++ b/arch/powerpc/mm/hugetlbpage-hash64.c
-@@ -114,3 +114,21 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid,
- *ptep = __pte(new_pte & ~_PAGE_BUSY);
- return 0;
- }
-+
-+#if defined(CONFIG_PPC_64K_PAGES) && defined(CONFIG_DEBUG_VM)
-+/*
-+ * This enables us to catch the wrong page directory format
-+ * Moved here so that we can use WARN() in the call.
-+ */
-+int hugepd_ok(hugepd_t hpd)
-+{
-+ bool is_hugepd;
-+
-+ /*
-+ * We should not find this format in page directory, warn otherwise.
-+ */
-+ is_hugepd = (((hpd.pd & 0x3) == 0x0) && ((hpd.pd & HUGEPD_SHIFT_MASK) != 0));
-+ WARN(is_hugepd, "Found wrong page directory format\n");
-+ return 0;
-+}
-+#endif
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
-index 9833fee493ec..bc72e542a83e 100644
+index 9833fee493ec..f20c1a9065da 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
-@@ -53,78 +53,6 @@ static unsigned nr_gpages;
+@@ -53,43 +53,6 @@ static unsigned nr_gpages;
#define hugepd_none(hpd) ((hpd).pd == 0)
@@ -278,24 +250,13 @@
- return ((pgd_val(pgd) & 0x3) != 0x0);
-}
-
--#if defined(CONFIG_PPC_64K_PAGES) && defined(CONFIG_DEBUG_VM)
--/*
-- * This enables us to catch the wrong page directory format
-- * Moved here so that we can use WARN() in the call.
-- */
--int hugepd_ok(hugepd_t hpd)
--{
-- bool is_hugepd;
--
-- /*
-- * We should not find this format in page directory, warn otherwise.
-- */
-- is_hugepd = (((hpd.pd & 0x3) == 0x0) && ((hpd.pd & HUGEPD_SHIFT_MASK) != 0));
-- WARN(is_hugepd, "Found wrong page directory format\n");
-- return 0;
--}
--#endif
--
+ #if defined(CONFIG_PPC_64K_PAGES) && defined(CONFIG_DEBUG_VM)
+ /*
+ * This enables us to catch the wrong page directory format
+@@ -108,23 +71,6 @@ int hugepd_ok(hugepd_t hpd)
+ }
+ #endif
+
-#else
-int pmd_huge(pmd_t pmd)
-{