diff options
| author |   Geoff Levand <geoff@infradead.org> | 2016-11-29 10:47:32 -0800 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2016-11-30 23:19:59 +1100 |
| commit | 6dff5b67054e17c91bd630bcdda17cfca5aa4215 (patch) | |
| tree | d8b13369d92eb1e077d056b109c46648bfa88d62 /arch/powerpc/boot/ps3-head.S | |
| parent | powerpc/prom: Switch to using structs for ibm_architecture_vec (diff) | |
| download | linux-dev-6dff5b67054e17c91bd630bcdda17cfca5aa4215.tar.xz linux-dev-6dff5b67054e17c91bd630bcdda17cfca5aa4215.zip | |
powerpc/ps3: Fix system hang with GCC 5 builds
GCC 5 generates different code for this bootwrapper null check that
causes the PS3 to hang very early in its bootup. This check is of
limited value, so just get rid of it.
Cc: stable@vger.kernel.org
Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/boot/ps3-head.S')
| -rw-r--r-- | arch/powerpc/boot/ps3-head.S | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/boot/ps3-head.S b/arch/powerpc/boot/ps3-head.S index b6fcbaf5027b..3dc44b05fb97 100644 --- a/arch/powerpc/boot/ps3-head.S +++ b/arch/powerpc/boot/ps3-head.S @@ -57,11 +57,6 @@ __system_reset_overlay: bctr 1: - /* Save the value at addr zero for a null pointer write check later. */ - - li r4, 0 - lwz r3, 0(r4) - /* Primary delays then goes to _zimage_start in wrapper. */ or 31, 31, 31 /* db16cyc */ |