From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v3 12/16] powerpc/44x: remove page.h from mmu-44x.h
Date: Thu, 5 Jul 2018 16:25:13 +0000 (UTC) [thread overview]
Message-ID: <820e0ab274673d336c49ea47273aae18e5723af5.1530807556.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1530807556.git.christophe.leroy@c-s.fr>
mmu-44x.h doesn't need asm/page.h if PAGE_SHIFT are replaced by CONFIG_PPC_XX_PAGES
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/include/asm/mmu-44x.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/include/asm/mmu-44x.h b/arch/powerpc/include/asm/mmu-44x.h
index 9bdbe1d1c9b9..295b3dbb2698 100644
--- a/arch/powerpc/include/asm/mmu-44x.h
+++ b/arch/powerpc/include/asm/mmu-44x.h
@@ -5,7 +5,6 @@
* PPC440 support
*/
-#include <asm/page.h>
#include <asm/asm-const.h>
#define PPC44x_MMUCR_TID 0x000000ff
@@ -125,19 +124,19 @@ typedef struct {
/* Size of the TLBs used for pinning in lowmem */
#define PPC_PIN_SIZE (1 << 28) /* 256M */
-#if (PAGE_SHIFT == 12)
+#if defined(CONFIG_PPC_4K_PAGES)
#define PPC44x_TLBE_SIZE PPC44x_TLB_4K
#define PPC47x_TLBE_SIZE PPC47x_TLB0_4K
#define mmu_virtual_psize MMU_PAGE_4K
-#elif (PAGE_SHIFT == 14)
+#elif defined(CONFIG_PPC_16K_PAGES)
#define PPC44x_TLBE_SIZE PPC44x_TLB_16K
#define PPC47x_TLBE_SIZE PPC47x_TLB0_16K
#define mmu_virtual_psize MMU_PAGE_16K
-#elif (PAGE_SHIFT == 16)
+#elif defined(CONFIG_PPC_64K_PAGES)
#define PPC44x_TLBE_SIZE PPC44x_TLB_64K
#define PPC47x_TLBE_SIZE PPC47x_TLB0_64K
#define mmu_virtual_psize MMU_PAGE_64K
-#elif (PAGE_SHIFT == 18)
+#elif defined(CONFIG_PPC_256K_PAGES)
#define PPC44x_TLBE_SIZE PPC44x_TLB_256K
#define mmu_virtual_psize MMU_PAGE_256K
#else
--
2.13.3
next prev parent reply other threads:[~2018-07-05 16:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-05 16:24 [PATCH v3 00/16] Remove unneccessary included headers Christophe Leroy
2018-07-05 16:24 ` [PATCH v3 01/16] powerpc: remove kdump.h from page.h Christophe Leroy
2018-08-01 5:24 ` [v3,01/16] " Michael Ellerman
2018-07-05 16:24 ` [PATCH v3 02/16] powerpc: remove unneeded inclusions of cpu_has_feature.h Christophe Leroy
2018-08-01 5:24 ` [v3, " Michael Ellerman
2018-07-05 16:24 ` [PATCH v3 03/16] powerpc/405: move PPC405_ERR77 in asm-405.h Christophe Leroy
2018-08-01 5:24 ` [v3,03/16] " Michael Ellerman
2018-07-05 16:24 ` [PATCH v3 04/16] powerpc: move ASM_CONST and stringify_in_c() into asm-const.h Christophe Leroy
2018-08-01 5:24 ` [v3, " Michael Ellerman
2018-07-05 16:24 ` [PATCH v3 05/16] powerpc: clean the inclusion of stringify.h Christophe Leroy
2018-08-01 5:24 ` [v3,05/16] " Michael Ellerman
2018-07-05 16:25 ` [PATCH v3 06/16] powerpc: clean inclusions of asm/feature-fixups.h Christophe Leroy
2018-08-01 5:24 ` [v3,06/16] " Michael Ellerman
2018-07-05 16:25 ` [PATCH v3 07/16] powerpc: remove superflous inclusions of asm/fixmap.h Christophe Leroy
2018-08-01 5:24 ` [v3,07/16] " Michael Ellerman
2018-07-05 16:25 ` [PATCH v3 08/16] powerpc: declare set_breakpoint() static Christophe Leroy
2018-08-01 5:24 ` [v3,08/16] " Michael Ellerman
2018-07-05 16:25 ` [PATCH v3 09/16] powerpc/book3s: Remove PPC_PIN_SIZE Christophe Leroy
2018-08-01 5:24 ` [v3,09/16] " Michael Ellerman
2018-07-05 16:25 ` [PATCH v3 10/16] powerpc: fix includes in asm/processor.h Christophe Leroy
2018-08-01 5:24 ` [v3,10/16] " Michael Ellerman
2018-07-05 16:25 ` [PATCH v3 11/16] powerpc/nohash: fix hash related comments in pgtable.h Christophe Leroy
2018-08-01 5:24 ` [v3, " Michael Ellerman
2018-07-05 16:25 ` Christophe Leroy [this message]
2018-08-01 5:24 ` [v3,12/16] powerpc/44x: remove page.h from mmu-44x.h Michael Ellerman
2018-07-05 16:25 ` [PATCH v3 13/16] powerpc: split reg.h in two parts Christophe Leroy
2018-07-05 16:25 ` [PATCH v3 14/16] powerpc: Split synch.h " Christophe Leroy
2018-07-05 16:25 ` [PATCH v3 15/16] powerpc: remove unnecessary inclusion of asm/tlbflush.h Christophe Leroy
2018-08-01 5:24 ` [v3, " Michael Ellerman
2018-07-05 16:25 ` [PATCH v3 16/16] powerpc: split asm/tlbflush.h Christophe Leroy
2018-08-01 5:24 ` [v3,16/16] " Michael Ellerman
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=820e0ab274673d336c49ea47273aae18e5723af5.1530807556.git.christophe.leroy@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.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).