浏览代码

powerpc: Move boot_paca into early_setup

The powerpc boot_paca symbol is now only used within the
early_setup() routine, so move it from its global definition
into early_setup().

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Geoff Levand 12 年之前
父节点
当前提交
6a7e406419
共有 3 个文件被更改,包括 2 次插入3 次删除
  1. 0 1
      arch/powerpc/include/asm/paca.h
  2. 0 2
      arch/powerpc/kernel/paca.c
  3. 2 0
      arch/powerpc/kernel/setup_64.c

+ 0 - 1
arch/powerpc/include/asm/paca.h

@@ -167,7 +167,6 @@ struct paca_struct {
 };
 };
 
 
 extern struct paca_struct *paca;
 extern struct paca_struct *paca;
-extern __initdata struct paca_struct boot_paca;
 extern void initialise_paca(struct paca_struct *new_paca, int cpu);
 extern void initialise_paca(struct paca_struct *new_paca, int cpu);
 extern void setup_paca(struct paca_struct *new_paca);
 extern void setup_paca(struct paca_struct *new_paca);
 extern void allocate_pacas(void);
 extern void allocate_pacas(void);

+ 0 - 2
arch/powerpc/kernel/paca.c

@@ -120,8 +120,6 @@ struct slb_shadow slb_shadow[] __cacheline_aligned = {
 struct paca_struct *paca;
 struct paca_struct *paca;
 EXPORT_SYMBOL(paca);
 EXPORT_SYMBOL(paca);
 
 
-struct paca_struct boot_paca;
-
 void __init initialise_paca(struct paca_struct *new_paca, int cpu)
 void __init initialise_paca(struct paca_struct *new_paca, int cpu)
 {
 {
        /* The TOC register (GPR2) points 32kB into the TOC, so that 64kB
        /* The TOC register (GPR2) points 32kB into the TOC, so that 64kB

+ 2 - 0
arch/powerpc/kernel/setup_64.c

@@ -177,6 +177,8 @@ early_param("smt-enabled", early_smt_enabled);
 
 
 void __init early_setup(unsigned long dt_ptr)
 void __init early_setup(unsigned long dt_ptr)
 {
 {
+	static __initdata struct paca_struct boot_paca;
+
 	/* -------- printk is _NOT_ safe to use here ! ------- */
 	/* -------- printk is _NOT_ safe to use here ! ------- */
 
 
 	/* Identify CPU type */
 	/* Identify CPU type */