[PATCH] Hexagon: remove checks for CONFIG_PAGE_SIZE_1MB

[PATCH] Hexagon: remove checks for CONFIG_PAGE_SIZE_1MB

[Paul Bolle]

There are two checks for CONFIG_PAGE_SIZE_1MB in hexagon's code. But
there is no Kconfig symbol PAGE_SIZE_1MB. Remove these unneeded checks
and the code they hide.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
Untested.

Richard preferred this over the equally trivial patch to add an entry
for PAGE_SIZE_1MB.

 arch/hexagon/include/asm/page.h    | 5 -----
 arch/hexagon/include/asm/pgtable.h | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/arch/hexagon/include/asm/page.h b/arch/hexagon/include/asm/page.h
index 93f5669b4aa1..7bcec3c0447c 100644
--- a/arch/hexagon/include/asm/page.h
+++ b/arch/hexagon/include/asm/page.h
@@ -45,11 +45,6 @@
 #define HEXAGON_L1_PTE_SIZE __HVM_PDE_S_256KB
 #endif
 
-#ifdef CONFIG_PAGE_SIZE_1MB
-#define PAGE_SHIFT 20
-#define HEXAGON_L1_PTE_SIZE __HVM_PDE_S_1MB
-#endif
-
 /*
  *  These should be defined in hugetlb.h, but apparently not.
  *  "Huge" for us should be 4MB or 16MB, which are both represented
diff --git a/arch/hexagon/include/asm/pgtable.h b/arch/hexagon/include/asm/pgtable.h
index d8bd54fa431e..861a993afb7e 100644
--- a/arch/hexagon/include/asm/pgtable.h
+++ b/arch/hexagon/include/asm/pgtable.h
@@ -111,10 +111,6 @@ extern unsigned long zero_page_mask;
 #define PTRS_PER_PTE 16
 #endif
 
-#ifdef CONFIG_PAGE_SIZE_1MB
-#define PTRS_PER_PTE 4
-#endif
-
 /*  Any bigger and the PTE disappears.  */
 #define pgd_ERROR(e) \
 	printk(KERN_ERR "%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__,\
-- 
1.9.0

Re: [PATCH] Hexagon: remove checks for CONFIG_PAGE_SIZE_1MB

[rkuo]

On Fri, May 23, 2014 at 04:37:25PM +0200, Paul Bolle wrote:
> There are two checks for CONFIG_PAGE_SIZE_1MB in hexagon's code. But
> there is no Kconfig symbol PAGE_SIZE_1MB. Remove these unneeded checks
> and the code they hide.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> Untested.
> 
> Richard preferred this over the equally trivial patch to add an entry
> for PAGE_SIZE_1MB.
> 
>  arch/hexagon/include/asm/page.h    | 5 -----
>  arch/hexagon/include/asm/pgtable.h | 4 ----
>  2 files changed, 9 deletions(-)
> 

Thanks!

Acked-by: Richard Kuo <rkuo@codeaurora.org>

-- 

Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation