From 5daa303df6b7b5ac430560f7a8ce0aa92fd78313 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 9 Apr 2008 17:21:26 +1000 Subject: [PATCH] --- yaml --- r: 91545 b: refs/heads/master c: 7c6352a4699e9a3a2d91b2cddbf3f1048207e904 h: refs/heads/master i: 91543: 72d88be132a96d2e376a75c1a8e1aff390d8cb4d v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/head_64.S | 4 ---- trunk/arch/powerpc/kernel/paca.c | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 856199f1d9c4..4d4775f6f842 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55045d47d7a8c4c61bc0ca6f2fac5087dd598bc3 +refs/heads/master: 7c6352a4699e9a3a2d91b2cddbf3f1048207e904 diff --git a/trunk/arch/powerpc/kernel/head_64.S b/trunk/arch/powerpc/kernel/head_64.S index 43a38d89eafc..44229c3749ac 100644 --- a/trunk/arch/powerpc/kernel/head_64.S +++ b/trunk/arch/powerpc/kernel/head_64.S @@ -1521,10 +1521,6 @@ _INIT_GLOBAL(start_here_common) li r0,0 stdu r0,-STACK_FRAME_OVERHEAD(r1) - /* ptr to current */ - LOAD_REG_IMMEDIATE(r4, init_task) - std r4,PACACURRENT(r13) - /* Load the TOC */ ld r2,PACATOC(r13) std r1,PACAKSAVE(r13) diff --git a/trunk/arch/powerpc/kernel/paca.c b/trunk/arch/powerpc/kernel/paca.c index 867b22d17385..ac163bd46cfd 100644 --- a/trunk/arch/powerpc/kernel/paca.c +++ b/trunk/arch/powerpc/kernel/paca.c @@ -73,6 +73,7 @@ struct slb_shadow slb_shadow[] __cacheline_aligned = { .kernel_toc = (unsigned long)(&__toc_start) + 0x8000UL, \ .hw_cpu_id = 0xffff, \ .slb_shadow_ptr = &slb_shadow[number], \ + .__current = &init_task, \ } struct paca_struct paca[] = {