sparc64: Only support 4MB huge pages and 8KB base pages.

Narrowing the scope of the page size configurations will make the
transparent hugepage changes much simpler.

In the end what we really want to do is have the kernel support multiple
huge page sizes and use whatever is appropriate as the context dictactes.

Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 0 insertions, 36 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index e184075877d7..91c780c973ba 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -230,25 +230,6 @@ config EARLYFB
         help
           Say Y here to enable a faster early framebuffer boot console.
 
-choice
-        prompt "Kernel page size" if SPARC64
-        default SPARC64_PAGE_SIZE_8KB
-
-config SPARC64_PAGE_SIZE_8KB
-        bool "8KB"
-        help
-          This lets you select the page size of the kernel.
-
-          8KB and 64KB work quite well, since SPARC ELF sections
-          provide for up to 64KB alignment.
-
-          If you don't know what to do, choose 8KB.
-
-config SPARC64_PAGE_SIZE_64KB
-        bool "64KB"
-
-endchoice
-
 config SECCOMP
         bool "Enable seccomp to safely compute untrusted bytecode"
         depends on SPARC64 && PROC_FS
@@ -320,23 +301,6 @@ config GENERIC_LOCKBREAK
         default y
         depends on SPARC64 && SMP && PREEMPT
 
-choice
-        prompt "SPARC64 Huge TLB Page Size"
-        depends on SPARC64 && HUGETLB_PAGE
-        default HUGETLB_PAGE_SIZE_4MB
-
-config HUGETLB_PAGE_SIZE_4MB
-        bool "4MB"
-
-config HUGETLB_PAGE_SIZE_512K
-        bool "512K"
-
-config HUGETLB_PAGE_SIZE_64K
-        depends on !SPARC64_PAGE_SIZE_64KB
-        bool "64K"
-
-endchoice
-
 config NUMA
         bool "NUMA support"
         depends on SPARC64 && SMP