Commit 15f1483404f3497c66872de13f3d585e3da87785
1 parent
825020c386
Exists in
master
and in
7 other branches
[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>
Showing 1 changed file with 1 additions and 6 deletions Side-by-side Diff
arch/sparc64/kernel/head.S
| ... | ... | @@ -78,11 +78,7 @@ |
| 78 | 78 | |
| 79 | 79 | /* PROM cif handler code address is in %o4. */ |
| 80 | 80 | sparc64_boot: |
| 81 | -1: rd %pc, %g7 | |
| 82 | - set 1b, %g1 | |
| 83 | - cmp %g1, %g7 | |
| 84 | - be,pn %xcc, sparc64_boot_after_remap | |
| 85 | - mov %o4, %l7 | |
| 81 | + mov %o4, %l7 | |
| 86 | 82 | |
| 87 | 83 | /* We need to remap the kernel. Use position independant |
| 88 | 84 | * code to remap us to KERNBASE. |
| ... | ... | @@ -295,7 +291,6 @@ |
| 295 | 291 | |
| 296 | 292 | add %sp, (192 + 128), %sp |
| 297 | 293 | |
| 298 | -sparc64_boot_after_remap: | |
| 299 | 294 | sethi %hi(prom_root_compatible), %g1 |
| 300 | 295 | or %g1, %lo(prom_root_compatible), %g1 |
| 301 | 296 | sethi %hi(prom_sun4v_name), %g7 |