Commit e6b39a5e authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds

[PATCH] ppc64: remove the paca pointer form the naca

The only place that was using the paca pointer that was in the naca was some
assembler that used it to find a parameter to pass to some C code.  That C
code did not even declare that parameter!

Remove the paca pointer.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ac22c842
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/naca.h>
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/iSeries/ItLpPaca.h> #include <asm/iSeries/ItLpPaca.h>
#include <asm/iSeries/ItLpQueue.h> #include <asm/iSeries/ItLpQueue.h>
...@@ -68,8 +67,6 @@ int main(void) ...@@ -68,8 +67,6 @@ int main(void)
#endif /* CONFIG_ALTIVEC */ #endif /* CONFIG_ALTIVEC */
DEFINE(MM, offsetof(struct task_struct, mm)); DEFINE(MM, offsetof(struct task_struct, mm));
/* naca */
DEFINE(PACA, offsetof(struct naca_struct, paca));
DEFINE(DCACHEL1LINESIZE, offsetof(struct ppc64_caches, dline_size)); DEFINE(DCACHEL1LINESIZE, offsetof(struct ppc64_caches, dline_size));
DEFINE(DCACHEL1LOGLINESIZE, offsetof(struct ppc64_caches, log_dline_size)); DEFINE(DCACHEL1LOGLINESIZE, offsetof(struct ppc64_caches, log_dline_size));
DEFINE(DCACHEL1LINESPERPAGE, offsetof(struct ppc64_caches, dlines_per_page)); DEFINE(DCACHEL1LINESPERPAGE, offsetof(struct ppc64_caches, dlines_per_page));
......
...@@ -517,12 +517,7 @@ __end_interrupts: ...@@ -517,12 +517,7 @@ __end_interrupts:
__start_naca: __start_naca:
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
.llong itVpdAreas .llong itVpdAreas
#else
.llong 0x0
#endif #endif
.llong 0x0
.llong 0x0
.llong paca
. = SYSTEMCFG_PHYS_ADDR . = SYSTEMCFG_PHYS_ADDR
.globl __end_naca .globl __end_naca
...@@ -1241,6 +1236,7 @@ _GLOBAL(pseries_secondary_smp_init) ...@@ -1241,6 +1236,7 @@ _GLOBAL(pseries_secondary_smp_init)
#endif #endif
#endif #endif
b 3b /* Loop until told to go */ b 3b /* Loop until told to go */
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
_STATIC(__start_initialization_iSeries) _STATIC(__start_initialization_iSeries)
/* Clear out the BSS */ /* Clear out the BSS */
...@@ -1278,10 +1274,6 @@ _STATIC(__start_initialization_iSeries) ...@@ -1278,10 +1274,6 @@ _STATIC(__start_initialization_iSeries)
SET_REG_TO_CONST(r4, NACA_VIRT_ADDR) SET_REG_TO_CONST(r4, NACA_VIRT_ADDR)
std r4,0(r9) /* set the naca pointer */ std r4,0(r9) /* set the naca pointer */
/* Get the pointer to the segment table */
ld r6,PACA(r4) /* Get the base paca pointer */
ld r4,PACASTABVIRT(r6)
bl .iSeries_early_setup bl .iSeries_early_setup
/* relocation is on at this point */ /* relocation is on at this point */
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
*/ */
#include <asm/types.h> #include <asm/types.h>
#include <asm/systemcfg.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
...@@ -20,7 +19,6 @@ struct naca_struct { ...@@ -20,7 +19,6 @@ struct naca_struct {
void *xItVpdAreas; /* VPD Data 0x00 */ void *xItVpdAreas; /* VPD Data 0x00 */
void *xRamDisk; /* iSeries ramdisk 0x08 */ void *xRamDisk; /* iSeries ramdisk 0x08 */
u64 xRamDiskSize; /* In pages 0x10 */ u64 xRamDiskSize; /* In pages 0x10 */
struct paca_struct *paca; /* Ptr to an array of pacas 0x18 */
u64 debug_switch; /* Debug print control 0x20 */ u64 debug_switch; /* Debug print control 0x20 */
u64 banner; /* Ptr to banner string 0x28 */ u64 banner; /* Ptr to banner string 0x28 */
u64 log; /* Ptr to log buffer 0x30 */ u64 log; /* Ptr to log buffer 0x30 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment