From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au
Cc: linuxppc-dev@lists.ozlabs.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [PATCH V2 14/31] powerpc/booke: Move booke headers (part 2)
Date: Wed, 30 Sep 2015 07:57:07 +0530 [thread overview]
Message-ID: <1443580044-30659-15-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1443580044-30659-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/{pgtable-ppc32.h => nohash/32/pgtable.h} | 0
arch/powerpc/include/asm/{pgtable-ppc64.h => nohash/64/pgtable.h} | 2 +-
arch/powerpc/include/asm/nohash/pgtable.h | 8 ++++----
3 files changed, 5 insertions(+), 5 deletions(-)
rename arch/powerpc/include/asm/{pgtable-ppc32.h => nohash/32/pgtable.h} (100%)
rename arch/powerpc/include/asm/{pgtable-ppc64.h => nohash/64/pgtable.h} (99%)
diff --git a/arch/powerpc/include/asm/pgtable-ppc32.h b/arch/powerpc/include/asm/nohash/32/pgtable.h
similarity index 100%
rename from arch/powerpc/include/asm/pgtable-ppc32.h
rename to arch/powerpc/include/asm/nohash/32/pgtable.h
diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/nohash/64/pgtable.h
similarity index 99%
rename from arch/powerpc/include/asm/pgtable-ppc64.h
rename to arch/powerpc/include/asm/nohash/64/pgtable.h
index 8c851dbc625f..8f6195f147a4 100644
--- a/arch/powerpc/include/asm/pgtable-ppc64.h
+++ b/arch/powerpc/include/asm/nohash/64/pgtable.h
@@ -18,7 +18,7 @@
* Size of EA range mapped by our pagetables.
*/
#define PGTABLE_EADDR_SIZE (PTE_INDEX_SIZE + PMD_INDEX_SIZE + \
- PUD_INDEX_SIZE + PGD_INDEX_SIZE + PAGE_SHIFT)
+ PUD_INDEX_SIZE + PGD_INDEX_SIZE + PAGE_SHIFT)
#define PGTABLE_RANGE (ASM_CONST(1) << PGTABLE_EADDR_SIZE)
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
diff --git a/arch/powerpc/include/asm/nohash/pgtable.h b/arch/powerpc/include/asm/nohash/pgtable.h
index 91325997ba25..c0c41a2409d2 100644
--- a/arch/powerpc/include/asm/nohash/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/pgtable.h
@@ -1,10 +1,10 @@
-#ifndef _ASM_POWERPC_PGTABLE_BOOK3E_H
-#define _ASM_POWERPC_PGTABLE_BOOK3E_H
+#ifndef _ASM_POWERPC_NOHASH_PGTABLE_H
+#define _ASM_POWERPC_NOHASH_PGTABLE_H
#if defined(CONFIG_PPC64)
-#include <asm/pgtable-ppc64.h>
+#include <asm/nohash/64/pgtable.h>
#else
-#include <asm/pgtable-ppc32.h>
+#include <asm/nohash/32/pgtable.h>
#endif
#ifndef __ASSEMBLY__
--
2.5.0
next prev parent reply other threads:[~2015-09-30 2:29 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-30 2:26 [PATCH V2 00/31] powerpc/mm: Update page table format for book3s 64 Aneesh Kumar K.V
2015-09-30 2:26 ` [PATCH V2 01/31] powerpc/mm: move pte headers to book3s directory Aneesh Kumar K.V
2015-09-30 2:26 ` [PATCH V2 02/31] powerpc/mm: move pte headers to book3s directory (part 2) Aneesh Kumar K.V
2015-09-30 2:26 ` [PATCH V2 03/31] powerpc/mm: make a separate copy for book3s Aneesh Kumar K.V
2015-09-30 2:26 ` [PATCH V2 04/31] powerpc/mm: make a separate copy for book3s (part 2) Aneesh Kumar K.V
2015-09-30 2:26 ` [PATCH V2 05/31] powerpc/mm: Move hash specific pte width and other defines to book3s Aneesh Kumar K.V
2015-09-30 2:26 ` [PATCH V2 06/31] powerpc/mm: Delete booke bits from book3s Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 07/31] powerpc/mm: Don't have generic headers introduce functions touching pte bits Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 08/31] powerpc/mm: Drop pte-common.h from BOOK3S 64 Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 09/31] powerpc/mm: Don't use pte_val as lvalue Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 10/31] powerpc/mm: Don't use pmd_val, pud_val and pgd_val " Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 11/31] powerpc/mm: Move hash64 PTE bits from book3s/64/pgtable.h to hash.h Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 12/31] powerpc/mm: Move PTE bits from generic functions to hash64 functions Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 13/31] powerpc/booke: Move booke headers (part 1) Aneesh Kumar K.V
2015-09-30 2:27 ` Aneesh Kumar K.V [this message]
2015-09-30 2:27 ` [PATCH V2 15/31] powerpc/booke: Move booke headers (part 3) Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 16/31] powerpc/booke: Move booke headers (part 4) Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 17/31] powerpc/booke: Move booke headers (part 5) Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 18/31] powerpc/mm: Increase the pte frag size Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 19/31] powerpc/mm: Convert 4k hash insert to C Aneesh Kumar K.V
2015-09-30 12:07 ` Anshuman Khandual
2015-09-30 20:18 ` Benjamin Herrenschmidt
2015-10-01 13:49 ` Anshuman Khandual
2015-09-30 2:27 ` [PATCH V2 20/31] powerpc/mm: update __real_pte to take address as argument Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 21/31] powerpc/mm: make pte page hash index slot 8 bits Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 22/31] powerpc/mm: Don't track subpage valid bit in pte_t Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 23/31] powerpc/mm: Increase the width of #define Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 24/31] powerpc/mm: Convert __hash_page_64K to C Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 25/31] powerpc/mm: Convert 4k insert from asm " Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 26/31] powerpc/mm: Remove the dependency on pte bit position in asm code Aneesh Kumar K.V
2015-09-30 13:09 ` Anshuman Khandual
2015-09-30 2:27 ` [PATCH V2 27/31] powerpc/mm: Add helper for converting pte bit to hpte bits Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 28/31] powerpc/mm: Move WIMG update to helper Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 29/31] powerpc/mm: Move hugetlb related headers Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 30/31] powerpc/mm: Move THP headers around Aneesh Kumar K.V
2015-09-30 2:27 ` [PATCH V2 31/31] powerpc/mm: Add a _PAGE_PTE bit Aneesh Kumar K.V
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=1443580044-30659-15-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
--to=aneesh.kumar@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
/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).