lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] Initialize paca->current earlier

Browse Source 
Currently, we initialize the "current" pointer in the PACA (which
is used by the "current" macro in the kernel) before calling
setup_system(). That means that early_setup() is called with
current still "NULL" which is -not- a good idea. It happens to
work so far but breaks with lockdep when early code calls printk.

This changes it so that all PACAs are statically initialized with
__current pointing to the init task. For non-0 CPUs, this is fixed
up before use.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt
2008-04-09 17:21:26 +10:00
committed by Paul Mackerras
parent 55045d47d7
commit 7c6352a469
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/head_64.S
View File

@@ -1521,10 +1521,6 @@ _INIT_GLOBAL(start_here_common)
li r0,0 li r0,0
stdu r0,-STACK_FRAME_OVERHEAD(r1) stdu r0,-STACK_FRAME_OVERHEAD(r1)
/* ptr to current */
LOAD_REG_IMMEDIATE(r4, init_task)
std r4,PACACURRENT(r13)
/* Load the TOC */ /* Load the TOC */
ld r2,PACATOC(r13) ld r2,PACATOC(r13)
std r1,PACAKSAVE(r13) std r1,PACAKSAVE(r13)

1
arch/powerpc/kernel/paca.c
View File

@@ -73,6 +73,7 @@ struct slb_shadow slb_shadow[] __cacheline_aligned = {
.kernel_toc = (unsigned long)(&__toc_start) + 0x8000UL, \ .kernel_toc = (unsigned long)(&__toc_start) + 0x8000UL, \
.hw_cpu_id = 0xffff, \ .hw_cpu_id = 0xffff, \
.slb_shadow_ptr = &slb_shadow[number], \ .slb_shadow_ptr = &slb_shadow[number], \
.__current = &init_task, \
} }
struct paca_struct paca[] = { struct paca_struct paca[] = {