diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2016-07-05 15:04:09 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-21 19:14:29 +1000 |
| commit | fa745a129cae93ca5d871ebac2a8f6c27ae3fbf2 (patch) | |
| tree | 1f936cf8f8efd7beab302c5f533de95013770a65 /arch/powerpc/kernel/head_64.S | |
| parent | 9df549afeab4ea968b6d83cf9d7a1e3c577a9846 (diff) | |
powerpc/64: Move the content of setup_system() to setup_arch()
And kill setup_system().
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/head_64.S')
| -rw-r--r-- | arch/powerpc/kernel/head_64.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 064cd9397836..f765b0434731 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S @@ -941,7 +941,7 @@ start_here_multiplatform: mtspr SPRN_SRR1,r4 RFI b . /* prevent speculative execution */ - + /* This is where all platforms converge execution */ start_here_common: @@ -951,9 +951,6 @@ start_here_common: /* Load the TOC (virtual address) */ ld r2,PACATOC(r13) - /* Do more system initializations in virtual mode */ - bl setup_system - /* Mark interrupts soft and hard disabled (they might be enabled * in the PACA when doing hotplug) */ |