From: Paul Bolle <pebolle@tiscali.nl>
To: Richard Kuo <rkuo@codeaurora.org>
Cc: linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] Hexagon: remove checks for CONFIG_PAGE_SIZE_1MB
Date: Fri, 23 May 2014 16:37:25 +0200 [thread overview]
Message-ID: <1400855845.31526.40.camel@x220> (raw)
In-Reply-To: <20140521002524.GF12698@codeaurora.org>
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
next prev parent reply other threads:[~2014-05-23 14:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-17 11:32 hexagon: CONFIG_PAGE_SIZE_1MB? Paul Bolle
2014-05-18 15:53 ` Rob Landley
2014-05-21 0:25 ` rkuo
2014-05-23 14:37 ` Paul Bolle [this message]
2014-05-29 2:31 ` [PATCH] Hexagon: remove checks for CONFIG_PAGE_SIZE_1MB rkuo
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=1400855845.31526.40.camel@x220 \
--to=pebolle@tiscali.nl \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rkuo@codeaurora.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).