sparc32: drop prom version check in head_32.S
authorSam Ravnborg <sam@ravnborg.org>
Sat, 12 May 2012 01:43:47 +0000 (01:43 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 12 May 2012 18:31:59 +0000 (11:31 -0700)
We already sorted out if we are a sun4/sun4c and halted.
So no need to check the prom version as we know this is
a v2 or v3 as sun4m, sun4d etc. does not use a v1 prom.

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

index 10830b5a9f4a936366530d759201561c34a56447..56e32a209bb4e5c073eeb18f05269f72ca3e8890 100644 (file)
@@ -675,19 +675,6 @@ execute_in_high_mem:
                sethi   %hi(linux_dbvec), %g1
                st      %o1, [%g1 + %lo(linux_dbvec)]
 
-               ld      [%o0 + 0x4], %o3
-               and     %o3, 0x3, %o5                   ! get the version
-
-               cmp     %o3, 0x2                        ! a v2 prom?
-               be      found_version
-                nop
-
-               /* paul@sfe.com.au */
-               cmp     %o3, 0x3                        ! a v3 prom?
-               be      found_version
-                nop
-
-found_version:
 /* Get the machine type via the mysterious romvec node operations. */
 
                add     %g7, 0x1c, %l1