From patchwork Mon Oct 12 18:40:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 529358 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 76DD4140E1A for ; Tue, 13 Oct 2015 06:02:59 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 561161A2E92 for ; Tue, 13 Oct 2015 06:02:59 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from e28smtp04.in.ibm.com (e28smtp04.in.ibm.com [122.248.162.4]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id D67C41A074F for ; Tue, 13 Oct 2015 05:40:34 +1100 (AEDT) Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 13 Oct 2015 00:10:32 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp04.in.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 13 Oct 2015 00:10:30 +0530 X-Helo: d28dlp01.in.ibm.com X-MailFrom: aneesh.kumar@linux.vnet.ibm.com X-RcptTo: linuxppc-dev@lists.ozlabs.org Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id B4A4EE005F for ; Tue, 13 Oct 2015 00:10:25 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay01.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t9CIeTXw6619554 for ; Tue, 13 Oct 2015 00:10:29 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t9CIeTJw013544 for ; Tue, 13 Oct 2015 00:10:29 +0530 Received: from skywalker.in.ibm.com ([9.79.179.85]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t9CIeOEJ013168; Tue, 13 Oct 2015 00:10:28 +0530 From: "Aneesh Kumar K.V" To: benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au, Scott Wood Subject: [PATCH v3 16/31] powerpc/booke: Move nohash headers (part 4) Date: Tue, 13 Oct 2015 00:10:00 +0530 Message-Id: <1444675215-19484-17-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1444675215-19484-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1444675215-19484-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15101218-0013-0000-0000-000007D34B71 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, "Aneesh Kumar K.V" MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Aneesh Kumar K.V --- arch/powerpc/include/asm/nohash/32/pgtable.h | 16 ++++++++-------- arch/powerpc/include/asm/{ => nohash/32}/pte-40x.h | 0 arch/powerpc/include/asm/{ => nohash/32}/pte-44x.h | 0 arch/powerpc/include/asm/{ => nohash/32}/pte-8xx.h | 0 arch/powerpc/include/asm/{ => nohash/32}/pte-fsl-booke.h | 0 arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- arch/powerpc/include/asm/{ => nohash}/pte-book3e.h | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename arch/powerpc/include/asm/{ => nohash/32}/pte-40x.h (100%) rename arch/powerpc/include/asm/{ => nohash/32}/pte-44x.h (100%) rename arch/powerpc/include/asm/{ => nohash/32}/pte-8xx.h (100%) rename arch/powerpc/include/asm/{ => nohash/32}/pte-fsl-booke.h (100%) rename arch/powerpc/include/asm/{ => nohash}/pte-book3e.h (100%) diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h index fbb23c54b998..c82cbf52d19e 100644 --- a/arch/powerpc/include/asm/nohash/32/pgtable.h +++ b/arch/powerpc/include/asm/nohash/32/pgtable.h @@ -1,5 +1,5 @@ -#ifndef _ASM_POWERPC_PGTABLE_PPC32_H -#define _ASM_POWERPC_PGTABLE_PPC32_H +#ifndef _ASM_POWERPC_NOHASH_32_PGTABLE_H +#define _ASM_POWERPC_NOHASH_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_NOHASH_32_PGTABLE_H */ diff --git a/arch/powerpc/include/asm/pte-40x.h b/arch/powerpc/include/asm/nohash/32/pte-40x.h similarity index 100% rename from arch/powerpc/include/asm/pte-40x.h rename to arch/powerpc/include/asm/nohash/32/pte-40x.h diff --git a/arch/powerpc/include/asm/pte-44x.h b/arch/powerpc/include/asm/nohash/32/pte-44x.h similarity index 100% rename from arch/powerpc/include/asm/pte-44x.h rename to arch/powerpc/include/asm/nohash/32/pte-44x.h diff --git a/arch/powerpc/include/asm/pte-8xx.h b/arch/powerpc/include/asm/nohash/32/pte-8xx.h similarity index 100% rename from arch/powerpc/include/asm/pte-8xx.h rename to arch/powerpc/include/asm/nohash/32/pte-8xx.h diff --git a/arch/powerpc/include/asm/pte-fsl-booke.h b/arch/powerpc/include/asm/nohash/32/pte-fsl-booke.h similarity index 100% rename from arch/powerpc/include/asm/pte-fsl-booke.h rename to arch/powerpc/include/asm/nohash/32/pte-fsl-booke.h diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h index aebb83f84b69..c24e03f22655 100644 --- a/arch/powerpc/include/asm/nohash/64/pgtable.h +++ b/arch/powerpc/include/asm/nohash/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/nohash/pte-book3e.h similarity index 100% rename from arch/powerpc/include/asm/pte-book3e.h rename to arch/powerpc/include/asm/nohash/pte-book3e.h