diff options
Diffstat (limited to 'include/asm-ia64/sn/xp.h')
-rw-r--r-- | include/asm-ia64/sn/xp.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/asm-ia64/sn/xp.h b/include/asm-ia64/sn/xp.h index 1df1c9f61a65..49faf8f26430 100644 --- a/include/asm-ia64/sn/xp.h +++ b/include/asm-ia64/sn/xp.h | |||
@@ -49,7 +49,7 @@ | |||
49 | * C-brick nasids, thus the need for bitmaps which don't account for | 49 | * C-brick nasids, thus the need for bitmaps which don't account for |
50 | * odd-numbered (non C-brick) nasids. | 50 | * odd-numbered (non C-brick) nasids. |
51 | */ | 51 | */ |
52 | #define XP_MAX_PHYSNODE_ID (MAX_PHYSNODE_ID / 2) | 52 | #define XP_MAX_PHYSNODE_ID (MAX_NUMALINK_NODES / 2) |
53 | #define XP_NASID_MASK_BYTES ((XP_MAX_PHYSNODE_ID + 7) / 8) | 53 | #define XP_NASID_MASK_BYTES ((XP_MAX_PHYSNODE_ID + 7) / 8) |
54 | #define XP_NASID_MASK_WORDS ((XP_MAX_PHYSNODE_ID + 63) / 64) | 54 | #define XP_NASID_MASK_WORDS ((XP_MAX_PHYSNODE_ID + 63) / 64) |
55 | 55 | ||
@@ -217,7 +217,17 @@ enum xpc_retval { | |||
217 | xpcInvalidPartid, /* 42: invalid partition ID */ | 217 | xpcInvalidPartid, /* 42: invalid partition ID */ |
218 | xpcLocalPartid, /* 43: local partition ID */ | 218 | xpcLocalPartid, /* 43: local partition ID */ |
219 | 219 | ||
220 | xpcUnknownReason /* 44: unknown reason -- must be last in list */ | 220 | xpcOtherGoingDown, /* 44: other side going down, reason unknown */ |
221 | xpcSystemGoingDown, /* 45: system is going down, reason unknown */ | ||
222 | xpcSystemHalt, /* 46: system is being halted */ | ||
223 | xpcSystemReboot, /* 47: system is being rebooted */ | ||
224 | xpcSystemPoweroff, /* 48: system is being powered off */ | ||
225 | |||
226 | xpcDisconnecting, /* 49: channel disconnecting (closing) */ | ||
227 | |||
228 | xpcOpenCloseError, /* 50: channel open/close protocol error */ | ||
229 | |||
230 | xpcUnknownReason /* 51: unknown reason -- must be last in list */ | ||
221 | }; | 231 | }; |
222 | 232 | ||
223 | 233 | ||
@@ -342,7 +352,7 @@ typedef void (*xpc_notify_func)(enum xpc_retval reason, partid_t partid, | |||
342 | * | 352 | * |
343 | * The 'func' field points to the function to call when aynchronous | 353 | * The 'func' field points to the function to call when aynchronous |
344 | * notification is required for such events as: a connection established/lost, | 354 | * notification is required for such events as: a connection established/lost, |
345 | * or an incomming message received, or an error condition encountered. A | 355 | * or an incoming message received, or an error condition encountered. A |
346 | * non-NULL 'func' field indicates that there is an active registration for | 356 | * non-NULL 'func' field indicates that there is an active registration for |
347 | * the channel. | 357 | * the channel. |
348 | */ | 358 | */ |