summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-05-07 10:00:55 +1000
committerPaul Mackerras <paulus@samba.org>2008-05-09 20:22:58 +1000
commit1b70c5a6491dd02263e6d104b72d9b536f987021 (patch)
treee6645be06c6262d9a743b2663b53035dacd63521 /arch
parent8af302e2dc91d4229968b8eedd4b45c0dd9fc717 (diff)
downloadlinux-3.10-1b70c5a6491dd02263e6d104b72d9b536f987021.tar.gz
linux-3.10-1b70c5a6491dd02263e6d104b72d9b536f987021.tar.bz2
linux-3.10-1b70c5a6491dd02263e6d104b72d9b536f987021.zip
[POWERPC] Fix bogus paca->_current initialization
When doing lockdep, I had two patches to initialize paca->_current early, one bogus, and one correct. Unfortunately both got merged as the bad one ended up being part of the main lockdep patch by mistake. This causes memory corruption at boot. This removes the offending code. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/head_64.S4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 024805e1747..25e84c0e116 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -1517,10 +1517,6 @@ _INIT_STATIC(start_here_multiplatform)
addi r2,r2,0x4000
add r2,r2,r26
- /* Set initial ptr to current */
- LOAD_REG_IMMEDIATE(r4, init_task)
- std r4,PACACURRENT(r13)
-
/* Do very early kernel initializations, including initial hash table,
* stab and slb setup before we turn on relocation. */