From 142cc039bdb3263e765a9a28e10048d9d9949df7 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sat, 12 May 2012 01:43:47 +0000 Subject: 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 Signed-off-by: David S. Miller --- arch/sparc/kernel/head_32.S | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'arch/sparc/kernel/head_32.S') diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S index 10830b5a9f4a..56e32a209bb4 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 -- cgit