[SPARC64]: Kill no-remapping-needed code in head.S

It branches around some necessary prom calls, which we would
need to do even if we are mapped at the correct location already.
So it doesn't work.

The idea was that this sort of thing could be used for the eventual
kexec implementation, but it is clear that this will need to be
done differently.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 6 deletions

diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 03ffaf895a22..baea10a98196 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -78,11 +78,7 @@ sparc_ramdisk_image64:
 
         /* PROM cif handler code address is in %o4.  */
 sparc64_boot:
-1:      rd      %pc, %g7
-        set     1b, %g1
-        cmp     %g1, %g7
-        be,pn   %xcc, sparc64_boot_after_remap
-         mov    %o4, %l7
+        mov     %o4, %l7
 
         /* We need to remap the kernel.  Use position independant
          * code to remap us to KERNBASE.
@@ -295,7 +291,6 @@ is_sun4v:
 
         add     %sp, (192 + 128), %sp
 
-sparc64_boot_after_remap:
         sethi   %hi(prom_root_compatible), %g1
         or      %g1, %lo(prom_root_compatible), %g1
         sethi   %hi(prom_sun4v_name), %g7