aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/sgi-xp/xpc.h
diff options
context:
space:
mode:
authorDean Nelson <dcn@sgi.com>2008-07-30 01:34:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-30 12:41:50 -0400
commit81fe7883d2c8a80a7145ad22f8cd8514d05412b9 (patch)
tree0e4e1200ad1ff4fb3e31f61c6befc8391c18d1e3 /drivers/misc/sgi-xp/xpc.h
parent04de741885bc7565a28150e82c56a56e544440e6 (diff)
sgi-xp: add 'jiffies' to reserved page's timestamp name
Rename XPC's reserved page's timestamp member to reflect the units of time involved. Signed-off-by: Dean Nelson <dcn@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/sgi-xp/xpc.h')
-rw-r--r--drivers/misc/sgi-xp/xpc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
index 0907934cdd8f..e194d3140f68 100644
--- a/drivers/misc/sgi-xp/xpc.h
+++ b/drivers/misc/sgi-xp/xpc.h
@@ -87,7 +87,7 @@
87 * which are partition specific (vars part). These are setup by XPC. 87 * which are partition specific (vars part). These are setup by XPC.
88 * (Local partition's vars pointers are xpc_vars and xpc_vars_part.) 88 * (Local partition's vars pointers are xpc_vars and xpc_vars_part.)
89 * 89 *
90 * Note: Until 'stamp' is set non-zero, the partition XPC code has not been 90 * Note: Until 'ts_jiffies' is set non-zero, the partition XPC code has not been
91 * initialized. 91 * initialized.
92 */ 92 */
93struct xpc_rsvd_page { 93struct xpc_rsvd_page {
@@ -101,7 +101,7 @@ struct xpc_rsvd_page {
101 u64 vars_pa; /* physical address of struct xpc_vars */ 101 u64 vars_pa; /* physical address of struct xpc_vars */
102 u64 activate_mq_gpa; /* global phys address of activate_mq */ 102 u64 activate_mq_gpa; /* global phys address of activate_mq */
103 } sn; 103 } sn;
104 unsigned long stamp; /* time when reserved page was setup by XPC */ 104 unsigned long ts_jiffies; /* timestamp when rsvd pg was setup by XPC */
105 u64 pad2[10]; /* align to last u64 in 2nd 64-byte cacheline */ 105 u64 pad2[10]; /* align to last u64 in 2nd 64-byte cacheline */
106 u64 SAL_nasids_size; /* SAL: size of each nasid mask in bytes */ 106 u64 SAL_nasids_size; /* SAL: size of each nasid mask in bytes */
107}; 107};
@@ -534,7 +534,7 @@ struct xpc_partition {
534 /* XPC HB infrastructure */ 534 /* XPC HB infrastructure */
535 535
536 u8 remote_rp_version; /* version# of partition's rsvd pg */ 536 u8 remote_rp_version; /* version# of partition's rsvd pg */
537 unsigned long remote_rp_stamp; /* time when rsvd pg was initialized */ 537 unsigned long remote_rp_ts_jiffies; /* timestamp when rsvd pg setup */
538 u64 remote_rp_pa; /* phys addr of partition's rsvd pg */ 538 u64 remote_rp_pa; /* phys addr of partition's rsvd pg */
539 u64 last_heartbeat; /* HB at last read */ 539 u64 last_heartbeat; /* HB at last read */
540 u32 activate_IRQ_rcvd; /* IRQs since activation */ 540 u32 activate_IRQ_rcvd; /* IRQs since activation */