Merge branch 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / arch / sparc / kernel / head.S

diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S
index 3bfd6085a91d7c2b2b1771ac773b445bd75d08b8..2d325fd845795e32361f658736784262f56bf5c0 100644 (file)
--- a/arch/sparc/kernel/head.S
+++ b/arch/sparc/kernel/head.S
@@ -32,7 +32,6 @@
  */
 
        .align 4
-        .globl  cputyp
 cputyp:
         .word   1
 
@@ -64,15 +63,9 @@ cputypvar_sun4m:
 
        .align 4
 
-#ifndef CONFIG_SUN4
 sun4_notsup:
-       .asciz  "Sparc-Linux sun4 needs a specially compiled kernel, turn CONFIG_SUN4 on.\n\n"
+       .asciz  "Sparc-Linux sun4 support does no longer exist.\n\n"
        .align 4
-#else
-sun4cdm_notsup:
-       .asciz  "Kernel compiled with CONFIG_SUN4 cannot run on SUN4C/SUN4M/SUN4D\nTurn CONFIG_SUN4 off.\n\n"
-       .align 4
-#endif
 
 sun4e_notsup:
         .asciz  "Sparc-Linux sun4e support does not exist\n\n"
@@ -781,15 +774,6 @@ execute_in_high_mem:
                 nop
 
 found_version:
-#ifdef CONFIG_SUN4
-/* For people who try sun4 kernels, even if Configure.help advises them. */
-               ld      [%g7 + 0x68], %o1
-               set     sun4cdm_notsup, %o0
-               call    %o1
-                nop
-               b       halt_me
-                nop
-#endif
 /* Get the machine type via the mysterious romvec node operations. */
 
                add     %g7, 0x1c, %l1          
@@ -1151,15 +1135,6 @@ sun4c_continue_boot:
                 nop
 
 sun4_init:
-#ifdef CONFIG_SUN4
-/* There, happy now Adrian? */
-               set     cputypval, %o2          ! Let everyone know we
-               set     ' ', %o0                        ! are a "sun4 " architecture
-               stb     %o0, [%o2 + 0x4]                
-
-               b got_prop 
-                nop
-#else
                sethi   %hi(SUN4_PROM_VECTOR+0x84), %o1
                ld      [%o1 + %lo(SUN4_PROM_VECTOR+0x84)], %o1
                set     sun4_notsup, %o0
@@ -1171,7 +1146,7 @@ sun4_init:
                 nop
 1:             ba      1b                      ! Cannot exit into KMON
                 nop
-#endif
+
 no_sun4e_here:
                ld      [%g7 + 0x68], %o1
                set     sun4e_notsup, %o0
@@ -1280,7 +1255,6 @@ halt_me:
  * gets initialized in c-code so all routines can use it.
  */
 
-       .globl  prom_vector_p
 prom_vector_p:
                .word 0