git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0-pre1
[linux-2.6.git]
/
include
/
asm-ppc64
/
paca.h
diff --git
a/include/asm-ppc64/paca.h
b/include/asm-ppc64/paca.h
index
71de51a
..
f893406
100644
(file)
--- a/
include/asm-ppc64/paca.h
+++ b/
include/asm-ppc64/paca.h
@@
-18,7
+18,7
@@
#include <linux/config.h>
#include <asm/types.h>
#include <linux/config.h>
#include <asm/types.h>
-#include <asm/
iSeries/ItLpP
aca.h>
+#include <asm/
lpp
aca.h>
#include <asm/iSeries/ItLpRegSave.h>
#include <asm/mmu.h>
#include <asm/iSeries/ItLpRegSave.h>
#include <asm/mmu.h>
@@
-34,8
+34,8
@@
struct ItLpQueue;
*
* This structure is not directly accessed by firmware or the service
* processor except for the first two pointers that point to the
*
* This structure is not directly accessed by firmware or the service
* processor except for the first two pointers that point to the
- *
ItLpP
aca area and the ItLpRegSave area for this CPU. Both the
- *
ItLpP
aca and ItLpRegSave objects are currently contained within the
+ *
lpp
aca area and the ItLpRegSave area for this CPU. Both the
+ *
lpp
aca and ItLpRegSave objects are currently contained within the
* PACA but they do not need to be.
*/
struct paca_struct {
* PACA but they do not need to be.
*/
struct paca_struct {
@@
-50,7
+50,7
@@
struct paca_struct {
* MAGIC: These first two pointers can't be moved - they're
* accessed by the firmware
*/
* MAGIC: These first two pointers can't be moved - they're
* accessed by the firmware
*/
- struct
ItLpPaca *lppaca_ptr;
/* Pointer to LpPaca for PLIC */
+ struct
lppaca *lppaca_ptr;
/* Pointer to LpPaca for PLIC */
struct ItLpRegSave *reg_save_ptr; /* Pointer to LpRegSave for PLIC */
/*
struct ItLpRegSave *reg_save_ptr; /* Pointer to LpRegSave for PLIC */
/*
@@
-68,7
+68,7
@@
struct paca_struct {
u64 stab_real; /* Absolute address of segment table */
u64 stab_addr; /* Virtual address of segment table */
void *emergency_sp; /* pointer to emergency stack */
u64 stab_real; /* Absolute address of segment table */
u64 stab_addr; /* Virtual address of segment table */
void *emergency_sp; /* pointer to emergency stack */
-
u
16 hw_cpu_id; /* Physical processor number */
+
s
16 hw_cpu_id; /* Physical processor number */
u8 cpu_start; /* At startup, processor spins until */
/* this becomes non-zero. */
u8 cpu_start; /* At startup, processor spins until */
/* this becomes non-zero. */
@@
-99,11
+99,17
@@
struct paca_struct {
u64 exdsi[8]; /* used for linear mapping hash table misses */
/*
u64 exdsi[8]; /* used for linear mapping hash table misses */
/*
- * iSeries structues which the hypervisor knows about - Not
- * sure if these particularly need to be cacheline aligned.
+ * iSeries structure which the hypervisor knows about -
+ * this structure should not cross a page boundary.
+ * The vpa_init/register_vpa call is now known to fail if the
+ * lppaca structure crosses a page boundary.
* The lppaca is also used on POWER5 pSeries boxes.
* The lppaca is also used on POWER5 pSeries boxes.
+ * The lppaca is 640 bytes long, and cannot readily change
+ * since the hypervisor knows its layout, so a 1kB
+ * alignment will suffice to ensure that it doesn't
+ * cross a page boundary.
*/
*/
- struct
ItLpPaca lppaca __attribute__((aligned(0x8
0)));
+ struct
lppaca lppaca __attribute__((__aligned__(0x40
0)));
#ifdef CONFIG_PPC_ISERIES
struct ItLpRegSave reg_save;
#endif
#ifdef CONFIG_PPC_ISERIES
struct ItLpRegSave reg_save;
#endif