From: Benjamin Herrenschmidt Date: Wed, 7 May 2008 00:00:55 +0000 (+1000) Subject: [POWERPC] Fix bogus paca->_current initialization X-Git-Tag: v2.6.26-rc2~16^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1b70c5a6491dd02263e6d104b72d9b536f987021;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Paul Mackerras --- 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. */