diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2005-08-19 14:52:31 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-08-29 10:53:33 +1000 |
commit | 2e2446ea0758cd57dd065962d9544e3f4d44ea2b (patch) | |
tree | 745b7fb19e2fb48265aed6eb8ee33217a9e3f22a /include/asm-ppc64 | |
parent | 19dbd0f6a74f7529d6d49dd50ad6b31adbe0598d (diff) | |
download | op-kernel-dev-2e2446ea0758cd57dd065962d9544e3f4d44ea2b.zip op-kernel-dev-2e2446ea0758cd57dd065962d9544e3f4d44ea2b.tar.gz |
[PATCH] Remove NACA fixed address constraint
Comments in head.S suggest that the iSeries naca has a fixed address,
because tools expect to find it there. The only tool which appears to
access the naca is addRamDisk, but both the in-kernel version and the
version used in RHEL and SuSE in fact locate the NACA the same way as
the hypervisor does, by following the pointer in the hvReleaseData
structure.
Since the requirement for a fixed address seems to be obsolete, this
patch removes the naca from head.S and replaces it with a normal C
initializer.
For good measure, it removes an old version of addRamDisk.c which was
sitting, unused, in the ppc32 tree.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc64')
-rw-r--r-- | include/asm-ppc64/naca.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-ppc64/naca.h b/include/asm-ppc64/naca.h index bfb7caa3..d2afe64 100644 --- a/include/asm-ppc64/naca.h +++ b/include/asm-ppc64/naca.h @@ -12,8 +12,6 @@ #include <asm/types.h> -#ifndef __ASSEMBLY__ - struct naca_struct { /* Kernel only data - undefined for user space */ void *xItVpdAreas; /* VPD Data 0x00 */ @@ -23,9 +21,4 @@ struct naca_struct { extern struct naca_struct naca; -#endif /* __ASSEMBLY__ */ - -#define NACA_PAGE 0x4 -#define NACA_PHYS_ADDR (NACA_PAGE<<PAGE_SHIFT) - #endif /* _NACA_H */ |