From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp05.au.ibm.com (e23smtp05.au.ibm.com [202.81.31.147]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 0F7E41A014B for ; Mon, 21 Sep 2015 16:42:39 +1000 (AEST) Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Sep 2015 16:42:37 +1000 Received: from d23relay08.au.ibm.com (d23relay08.au.ibm.com [9.185.71.33]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id C39823578053 for ; Mon, 21 Sep 2015 16:42:35 +1000 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay08.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t8L6gIgZ56492152 for ; Mon, 21 Sep 2015 16:42:26 +1000 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t8L6g3pQ014959 for ; Mon, 21 Sep 2015 16:42:03 +1000 From: "Aneesh Kumar K.V" To: benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au Cc: linuxppc-dev@lists.ozlabs.org, "Aneesh Kumar K.V" Subject: [PATCH 16/31] powerpc/booke: Move booke headers (part 4) Date: Mon, 21 Sep 2015 12:10:43 +0530 Message-Id: <1442817658-2588-17-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1442817658-2588-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1442817658-2588-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Signed-off-by: Aneesh Kumar K.V --- arch/powerpc/include/asm/booke/32/pgtable.h | 16 ++++++++-------- arch/powerpc/include/asm/{ => booke/32}/pte-40x.h | 0 arch/powerpc/include/asm/{ => booke/32}/pte-44x.h | 0 arch/powerpc/include/asm/{ => booke/32}/pte-8xx.h | 0 arch/powerpc/include/asm/{ => booke/32}/pte-fsl-booke.h | 0 arch/powerpc/include/asm/booke/64/pgtable.h | 2 +- arch/powerpc/include/asm/{ => booke}/pte-book3e.h | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename arch/powerpc/include/asm/{ => booke/32}/pte-40x.h (100%) rename arch/powerpc/include/asm/{ => booke/32}/pte-44x.h (100%) rename arch/powerpc/include/asm/{ => booke/32}/pte-8xx.h (100%) rename arch/powerpc/include/asm/{ => booke/32}/pte-fsl-booke.h (100%) rename arch/powerpc/include/asm/{ => booke}/pte-book3e.h (100%) diff --git a/arch/powerpc/include/asm/booke/32/pgtable.h b/arch/powerpc/include/asm/booke/32/pgtable.h index fbb23c54b998..cab4a4b30ddc 100644 --- a/arch/powerpc/include/asm/booke/32/pgtable.h +++ b/arch/powerpc/include/asm/booke/32/pgtable.h @@ -1,5 +1,5 @@ -#ifndef _ASM_POWERPC_PGTABLE_PPC32_H -#define _ASM_POWERPC_PGTABLE_PPC32_H +#ifndef _ASM_POWERPC_BOOKE_32_PGTABLE_H +#define _ASM_POWERPC_BOOKE_32_PGTABLE_H #include @@ -106,15 +106,15 @@ extern int icache_44x_need_flush; */ #if defined(CONFIG_40x) -#include +#include #elif defined(CONFIG_44x) -#include +#include #elif defined(CONFIG_FSL_BOOKE) && defined(CONFIG_PTE_64BIT) -#include +#include #elif defined(CONFIG_FSL_BOOKE) -#include +#include #elif defined(CONFIG_8xx) -#include +#include #endif /* And here we include common definitions */ @@ -340,4 +340,4 @@ extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep, #endif /* !__ASSEMBLY__ */ -#endif /* _ASM_POWERPC_PGTABLE_PPC32_H */ +#endif /* __ASM_POWERPC_BOOKE_32_PGTABLE_H */ diff --git a/arch/powerpc/include/asm/pte-40x.h b/arch/powerpc/include/asm/booke/32/pte-40x.h similarity index 100% rename from arch/powerpc/include/asm/pte-40x.h rename to arch/powerpc/include/asm/booke/32/pte-40x.h diff --git a/arch/powerpc/include/asm/pte-44x.h b/arch/powerpc/include/asm/booke/32/pte-44x.h similarity index 100% rename from arch/powerpc/include/asm/pte-44x.h rename to arch/powerpc/include/asm/booke/32/pte-44x.h diff --git a/arch/powerpc/include/asm/pte-8xx.h b/arch/powerpc/include/asm/booke/32/pte-8xx.h similarity index 100% rename from arch/powerpc/include/asm/pte-8xx.h rename to arch/powerpc/include/asm/booke/32/pte-8xx.h diff --git a/arch/powerpc/include/asm/pte-fsl-booke.h b/arch/powerpc/include/asm/booke/32/pte-fsl-booke.h similarity index 100% rename from arch/powerpc/include/asm/pte-fsl-booke.h rename to arch/powerpc/include/asm/booke/32/pte-fsl-booke.h diff --git a/arch/powerpc/include/asm/booke/64/pgtable.h b/arch/powerpc/include/asm/booke/64/pgtable.h index 8cabf26babd9..9abf7a1720f7 100644 --- a/arch/powerpc/include/asm/booke/64/pgtable.h +++ b/arch/powerpc/include/asm/booke/64/pgtable.h @@ -97,7 +97,7 @@ /* * Include the PTE bits definitions */ -#include +#include #include #ifdef CONFIG_PPC_MM_SLICES diff --git a/arch/powerpc/include/asm/pte-book3e.h b/arch/powerpc/include/asm/booke/pte-book3e.h similarity index 100% rename from arch/powerpc/include/asm/pte-book3e.h rename to arch/powerpc/include/asm/booke/pte-book3e.h -- 2.5.0