From: Sam Ravnborg Date: Sat, 12 May 2012 01:43:47 +0000 (+0000) Subject: sparc32: drop prom version check in head_32.S X-Git-Tag: v3.5~442^2~65 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=142cc039bdb3263e765a9a28e10048d9d9949df7;p=platform%2Fkernel%2Flinux-amlogic.git 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 --- diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S index 10830b5..56e32a2 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