aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2012-05-12 01:43:47 +0000
committerDavid S. Miller <davem@davemloft.net>2012-05-12 11:31:59 -0700
commit142cc039bdb3263e765a9a28e10048d9d9949df7 (patch)
tree25a92cebfa0be8cc7aedb47feccaf80611a60e9f /arch/sparc/kernel
parent1b4cb70ec81b2c3a01e040afc969193c7a816604 (diff)
downloadlinux-142cc039bdb3263e765a9a28e10048d9d9949df7.tar.gz
sparc32: drop prom version check in head_32.S
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>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r--arch/sparc/kernel/head_32.S13
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S
index 10830b5a9f4..56e32a209bb 100644
--- a/arch/sparc/kernel/head_32.S
+++ b/arch/sparc/kernel/head_32.S
@@ -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