3 files changed, 4 insertions, 19 deletions

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 1aeb1da9829d..7c88263256af 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -98,19 +98,11 @@ config SPARC64_PAGE_SIZE_8KB
           8KB and 64KB work quite well, since SPARC ELF sections
           provide for up to 64KB alignment.
 
-          Therefore, 512KB and 4MB are for expert hackers only.
-
           If you don't know what to do, choose 8KB.
 
 config SPARC64_PAGE_SIZE_64KB
         bool "64KB"
 
-config SPARC64_PAGE_SIZE_512KB
-        bool "512KB"
-
-config SPARC64_PAGE_SIZE_4MB
-        bool "4MB"
-
 endchoice
 
 config SECCOMP
@@ -226,11 +218,10 @@ config HUGETLB_PAGE_SIZE_4MB
         bool "4MB"
 
 config HUGETLB_PAGE_SIZE_512K
-        depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB
         bool "512K"
 
 config HUGETLB_PAGE_SIZE_64K
-        depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB && !SPARC64_PAGE_SIZE_64KB
+        depends on !SPARC64_PAGE_SIZE_64KB
         bool "64K"
 
 endchoice
diff --git a/arch/sparc64/lib/copy_page.S b/arch/sparc64/lib/copy_page.S
index 37460666a5c3..b243d3b606ba 100644
--- a/arch/sparc64/lib/copy_page.S
+++ b/arch/sparc64/lib/copy_page.S
@@ -25,9 +25,9 @@
 
 #define DCACHE_SIZE     (PAGE_SIZE * 2)
 
-#if (PAGE_SHIFT == 13) || (PAGE_SHIFT == 19)
+#if (PAGE_SHIFT == 13)
 #define PAGE_SIZE_REM   0x80
-#elif (PAGE_SHIFT == 16) || (PAGE_SHIFT == 22)
+#elif (PAGE_SHIFT == 16)
 #define PAGE_SIZE_REM   0x100
 #else
 #error Wrong PAGE_SHIFT specified
@@ -198,7 +198,7 @@ cheetah_copy_page_insn:
         cmp             %o2, PAGE_SIZE_REM
         bne,pt          %xcc, 1b
          add            %o0, 0x40, %o0
-#if (PAGE_SHIFT == 16) || (PAGE_SHIFT == 22)
+#if (PAGE_SHIFT == 16)
         TOUCH(f0, f2, f4, f6, f8, f10, f12, f14)
         ldda            [%o1] ASI_BLK_P, %f32
         stda            %f48, [%o0] %asi
diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c
index fe70c8a557b5..3547937b17a2 100644
--- a/arch/sparc64/mm/tsb.c
+++ b/arch/sparc64/mm/tsb.c
@@ -96,12 +96,6 @@ void flush_tsb_user(struct mmu_gather *mp)
 #elif defined(CONFIG_SPARC64_PAGE_SIZE_64KB)
 #define HV_PGSZ_IDX_BASE        HV_PGSZ_IDX_64K
 #define HV_PGSZ_MASK_BASE       HV_PGSZ_MASK_64K
-#elif defined(CONFIG_SPARC64_PAGE_SIZE_512KB)
-#define HV_PGSZ_IDX_BASE        HV_PGSZ_IDX_512K
-#define HV_PGSZ_MASK_BASE       HV_PGSZ_MASK_512K
-#elif defined(CONFIG_SPARC64_PAGE_SIZE_4MB)
-#define HV_PGSZ_IDX_BASE        HV_PGSZ_IDX_4MB
-#define HV_PGSZ_MASK_BASE       HV_PGSZ_MASK_4MB
 #else
 #error Broken base page size setting...
 #endif