sparc32: remove all uses of ARCH_SUN4C

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 6 insertions, 11 deletions

diff --git a/arch/sparc/mm/btfixup.c b/arch/sparc/mm/btfixup.c
index 09d6af22db2d..1b7aa565497e 100644
--- a/arch/sparc/mm/btfixup.c
+++ b/arch/sparc/mm/btfixup.c
@@ -19,7 +19,6 @@
 
 extern char *srmmu_name;
 static char version[] __initdata = "Boot time fixup v1.6. 4/Mar/98 Jakub Jelinek (jj@ultra.linux.cz). Patching kernel for ";
-static char str_sun4c[] __initdata = "sun4c\n";
 static char str_srmmu[] __initdata = "srmmu[%s]/";
 static char str_iommu[] __initdata = "iommu\n";
 static char str_iounit[] __initdata = "io-unit\n";
@@ -81,15 +80,11 @@ void __init btfixup(void)
         if (!visited) {
                 visited++;
                 printk(version);
-                if (ARCH_SUN4C)
-                        printk(str_sun4c);
-                else {
-                        printk(str_srmmu, srmmu_name);
-                        if (sparc_cpu_model == sun4d)
-                                printk(str_iounit);
-                        else
-                                printk(str_iommu);
-                }
+                printk(str_srmmu, srmmu_name);
+                if (sparc_cpu_model == sun4d)
+                        printk(str_iounit);
+                else
+                        printk(str_iommu);
         }
         for (p = ___btfixup_start; p < ___btfixup_end; ) {
                 count = p[2];
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index 734812105266..a0f4db9d3a4f 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -235,7 +235,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
          * nothing more.
          */
         code = SEGV_MAPERR;
-        if (!ARCH_SUN4C && address >= TASK_SIZE)
+        if (address >= TASK_SIZE)
                 goto vmalloc_fault;
 
         /*