aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/sgi-xp
diff options
context:
space:
mode:
authorDean Nelson <dcn@sgi.com>2008-07-30 01:34:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-30 12:41:50 -0400
commit83469b5525b4a35be40b17cb41d64118d84d9f80 (patch)
treee258238c04b25892c1b1fc85ef42b67ce5bac873 /drivers/misc/sgi-xp
parent61deb86e98f51151b225f7563ee1cf2b50857d10 (diff)
sgi-xp: cleanup naming of partition defines
Cleanup naming of partition defines. Signed-off-by: Dean Nelson <dcn@sgi.com> Cc: Jack Steiner <steiner@sgi.com> Cc: "Luck, Tony" <tony.luck@intel.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')
-rw-r--r--drivers/misc/sgi-xp/xpc.h22
-rw-r--r--drivers/misc/sgi-xp/xpc_channel.c10
-rw-r--r--drivers/misc/sgi-xp/xpc_main.c32
-rw-r--r--drivers/misc/sgi-xp/xpc_partition.c18
-rw-r--r--drivers/misc/sgi-xp/xpc_sn2.c20
5 files changed, 51 insertions, 51 deletions
diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
index f258f89b8d3c..1e48f7765050 100644
--- a/drivers/misc/sgi-xp/xpc.h
+++ b/drivers/misc/sgi-xp/xpc.h
@@ -576,21 +576,21 @@ struct xpc_partition {
576 576
577/* struct xpc_partition act_state values (for XPC HB) */ 577/* struct xpc_partition act_state values (for XPC HB) */
578 578
579#define XPC_P_INACTIVE 0x00 /* partition is not active */ 579#define XPC_P_AS_INACTIVE 0x00 /* partition is not active */
580#define XPC_P_ACTIVATION_REQ 0x01 /* created thread to activate */ 580#define XPC_P_AS_ACTIVATION_REQ 0x01 /* created thread to activate */
581#define XPC_P_ACTIVATING 0x02 /* activation thread started */ 581#define XPC_P_AS_ACTIVATING 0x02 /* activation thread started */
582#define XPC_P_ACTIVE 0x03 /* xpc_partition_up() was called */ 582#define XPC_P_AS_ACTIVE 0x03 /* xpc_partition_up() was called */
583#define XPC_P_DEACTIVATING 0x04 /* partition deactivation initiated */ 583#define XPC_P_AS_DEACTIVATING 0x04 /* partition deactivation initiated */
584 584
585#define XPC_DEACTIVATE_PARTITION(_p, _reason) \ 585#define XPC_DEACTIVATE_PARTITION(_p, _reason) \
586 xpc_deactivate_partition(__LINE__, (_p), (_reason)) 586 xpc_deactivate_partition(__LINE__, (_p), (_reason))
587 587
588/* struct xpc_partition setup_state values */ 588/* struct xpc_partition setup_state values */
589 589
590#define XPC_P_UNSET 0x00 /* infrastructure was never setup */ 590#define XPC_P_SS_UNSET 0x00 /* infrastructure was never setup */
591#define XPC_P_SETUP 0x01 /* infrastructure is setup */ 591#define XPC_P_SS_SETUP 0x01 /* infrastructure is setup */
592#define XPC_P_WTEARDOWN 0x02 /* waiting to teardown infrastructure */ 592#define XPC_P_SS_WTEARDOWN 0x02 /* waiting to teardown infrastructure */
593#define XPC_P_TORNDOWN 0x03 /* infrastructure is torndown */ 593#define XPC_P_SS_TORNDOWN 0x03 /* infrastructure is torndown */
594 594
595/* 595/*
596 * struct xpc_partition_sn2's dropped notify IRQ timer is set to wait the 596 * struct xpc_partition_sn2's dropped notify IRQ timer is set to wait the
@@ -787,7 +787,7 @@ xpc_part_deref(struct xpc_partition *part)
787 s32 refs = atomic_dec_return(&part->references); 787 s32 refs = atomic_dec_return(&part->references);
788 788
789 DBUG_ON(refs < 0); 789 DBUG_ON(refs < 0);
790 if (refs == 0 && part->setup_state == XPC_P_WTEARDOWN) 790 if (refs == 0 && part->setup_state == XPC_P_SS_WTEARDOWN)
791 wake_up(&part->teardown_wq); 791 wake_up(&part->teardown_wq);
792} 792}
793 793
@@ -797,7 +797,7 @@ xpc_part_ref(struct xpc_partition *part)
797 int setup; 797 int setup;
798 798
799 atomic_inc(&part->references); 799 atomic_inc(&part->references);
800 setup = (part->setup_state == XPC_P_SETUP); 800 setup = (part->setup_state == XPC_P_SS_SETUP);
801 if (!setup) 801 if (!setup)
802 xpc_part_deref(part); 802 xpc_part_deref(part);
803 803
diff --git a/drivers/misc/sgi-xp/xpc_channel.c b/drivers/misc/sgi-xp/xpc_channel.c
index d7a15f1a78a5..17ab75d69e83 100644
--- a/drivers/misc/sgi-xp/xpc_channel.c
+++ b/drivers/misc/sgi-xp/xpc_channel.c
@@ -99,7 +99,7 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
99 DBUG_ON((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) && 99 DBUG_ON((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
100 !(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE)); 100 !(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE));
101 101
102 if (part->act_state == XPC_P_DEACTIVATING) { 102 if (part->act_state == XPC_P_AS_DEACTIVATING) {
103 /* can't proceed until the other side disengages from us */ 103 /* can't proceed until the other side disengages from us */
104 if (xpc_partition_engaged(ch->partid)) 104 if (xpc_partition_engaged(ch->partid))
105 return; 105 return;
@@ -155,7 +155,7 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
155 /* we won't lose the CPU since we're holding ch->lock */ 155 /* we won't lose the CPU since we're holding ch->lock */
156 complete(&ch->wdisconnect_wait); 156 complete(&ch->wdisconnect_wait);
157 } else if (ch->delayed_chctl_flags) { 157 } else if (ch->delayed_chctl_flags) {
158 if (part->act_state != XPC_P_DEACTIVATING) { 158 if (part->act_state != XPC_P_AS_DEACTIVATING) {
159 /* time to take action on any delayed chctl flags */ 159 /* time to take action on any delayed chctl flags */
160 spin_lock(&part->chctl_lock); 160 spin_lock(&part->chctl_lock);
161 part->chctl.flags[ch->number] |= 161 part->chctl.flags[ch->number] |=
@@ -276,7 +276,7 @@ again:
276 "%d, channel=%d\n", ch->partid, ch->number); 276 "%d, channel=%d\n", ch->partid, ch->number);
277 277
278 if (ch->flags & XPC_C_DISCONNECTED) { 278 if (ch->flags & XPC_C_DISCONNECTED) {
279 DBUG_ON(part->act_state != XPC_P_DEACTIVATING); 279 DBUG_ON(part->act_state != XPC_P_AS_DEACTIVATING);
280 spin_unlock_irqrestore(&ch->lock, irq_flags); 280 spin_unlock_irqrestore(&ch->lock, irq_flags);
281 return; 281 return;
282 } 282 }
@@ -312,7 +312,7 @@ again:
312 "channel=%d\n", args->msg_size, args->local_nentries, 312 "channel=%d\n", args->msg_size, args->local_nentries,
313 ch->partid, ch->number); 313 ch->partid, ch->number);
314 314
315 if (part->act_state == XPC_P_DEACTIVATING || 315 if (part->act_state == XPC_P_AS_DEACTIVATING ||
316 (ch->flags & XPC_C_ROPENREQUEST)) { 316 (ch->flags & XPC_C_ROPENREQUEST)) {
317 spin_unlock_irqrestore(&ch->lock, irq_flags); 317 spin_unlock_irqrestore(&ch->lock, irq_flags);
318 return; 318 return;
@@ -546,7 +546,7 @@ xpc_process_sent_chctl_flags(struct xpc_partition *part)
546 continue; 546 continue;
547 } 547 }
548 548
549 if (part->act_state == XPC_P_DEACTIVATING) 549 if (part->act_state == XPC_P_AS_DEACTIVATING)
550 continue; 550 continue;
551 551
552 if (!(ch_flags & XPC_C_CONNECTED)) { 552 if (!(ch_flags & XPC_C_CONNECTED)) {
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
index f4d866113f2a..b303c130bba8 100644
--- a/drivers/misc/sgi-xp/xpc_main.c
+++ b/drivers/misc/sgi-xp/xpc_main.c
@@ -290,8 +290,8 @@ xpc_check_remote_hb(void)
290 290
291 part = &xpc_partitions[partid]; 291 part = &xpc_partitions[partid];
292 292
293 if (part->act_state == XPC_P_INACTIVE || 293 if (part->act_state == XPC_P_AS_INACTIVE ||
294 part->act_state == XPC_P_DEACTIVATING) { 294 part->act_state == XPC_P_AS_DEACTIVATING) {
295 continue; 295 continue;
296 } 296 }
297 297
@@ -406,7 +406,7 @@ xpc_initiate_discovery(void *ignore)
406static void 406static void
407xpc_channel_mgr(struct xpc_partition *part) 407xpc_channel_mgr(struct xpc_partition *part)
408{ 408{
409 while (part->act_state != XPC_P_DEACTIVATING || 409 while (part->act_state != XPC_P_AS_DEACTIVATING ||
410 atomic_read(&part->nchannels_active) > 0 || 410 atomic_read(&part->nchannels_active) > 0 ||
411 !xpc_partition_disengaged(part)) { 411 !xpc_partition_disengaged(part)) {
412 412
@@ -429,7 +429,7 @@ xpc_channel_mgr(struct xpc_partition *part)
429 (void)wait_event_interruptible(part->channel_mgr_wq, 429 (void)wait_event_interruptible(part->channel_mgr_wq,
430 (atomic_read(&part->channel_mgr_requests) > 0 || 430 (atomic_read(&part->channel_mgr_requests) > 0 ||
431 part->chctl.all_flags != 0 || 431 part->chctl.all_flags != 0 ||
432 (part->act_state == XPC_P_DEACTIVATING && 432 (part->act_state == XPC_P_AS_DEACTIVATING &&
433 atomic_read(&part->nchannels_active) == 0 && 433 atomic_read(&part->nchannels_active) == 0 &&
434 xpc_partition_disengaged(part)))); 434 xpc_partition_disengaged(part))));
435 atomic_set(&part->channel_mgr_requests, 1); 435 atomic_set(&part->channel_mgr_requests, 1);
@@ -458,16 +458,16 @@ xpc_activating(void *__partid)
458 458
459 spin_lock_irqsave(&part->act_lock, irq_flags); 459 spin_lock_irqsave(&part->act_lock, irq_flags);
460 460
461 if (part->act_state == XPC_P_DEACTIVATING) { 461 if (part->act_state == XPC_P_AS_DEACTIVATING) {
462 part->act_state = XPC_P_INACTIVE; 462 part->act_state = XPC_P_AS_INACTIVE;
463 spin_unlock_irqrestore(&part->act_lock, irq_flags); 463 spin_unlock_irqrestore(&part->act_lock, irq_flags);
464 part->remote_rp_pa = 0; 464 part->remote_rp_pa = 0;
465 return 0; 465 return 0;
466 } 466 }
467 467
468 /* indicate the thread is activating */ 468 /* indicate the thread is activating */
469 DBUG_ON(part->act_state != XPC_P_ACTIVATION_REQ); 469 DBUG_ON(part->act_state != XPC_P_AS_ACTIVATION_REQ);
470 part->act_state = XPC_P_ACTIVATING; 470 part->act_state = XPC_P_AS_ACTIVATING;
471 471
472 XPC_SET_REASON(part, 0, 0); 472 XPC_SET_REASON(part, 0, 0);
473 spin_unlock_irqrestore(&part->act_lock, irq_flags); 473 spin_unlock_irqrestore(&part->act_lock, irq_flags);
@@ -509,9 +509,9 @@ xpc_activate_partition(struct xpc_partition *part)
509 509
510 spin_lock_irqsave(&part->act_lock, irq_flags); 510 spin_lock_irqsave(&part->act_lock, irq_flags);
511 511
512 DBUG_ON(part->act_state != XPC_P_INACTIVE); 512 DBUG_ON(part->act_state != XPC_P_AS_INACTIVE);
513 513
514 part->act_state = XPC_P_ACTIVATION_REQ; 514 part->act_state = XPC_P_AS_ACTIVATION_REQ;
515 XPC_SET_REASON(part, xpCloneKThread, __LINE__); 515 XPC_SET_REASON(part, xpCloneKThread, __LINE__);
516 516
517 spin_unlock_irqrestore(&part->act_lock, irq_flags); 517 spin_unlock_irqrestore(&part->act_lock, irq_flags);
@@ -520,7 +520,7 @@ xpc_activate_partition(struct xpc_partition *part)
520 partid); 520 partid);
521 if (IS_ERR(kthread)) { 521 if (IS_ERR(kthread)) {
522 spin_lock_irqsave(&part->act_lock, irq_flags); 522 spin_lock_irqsave(&part->act_lock, irq_flags);
523 part->act_state = XPC_P_INACTIVE; 523 part->act_state = XPC_P_AS_INACTIVE;
524 XPC_SET_REASON(part, xpCloneKThreadFailed, __LINE__); 524 XPC_SET_REASON(part, xpCloneKThreadFailed, __LINE__);
525 spin_unlock_irqrestore(&part->act_lock, irq_flags); 525 spin_unlock_irqrestore(&part->act_lock, irq_flags);
526 } 526 }
@@ -786,7 +786,7 @@ xpc_disconnect_wait(int ch_number)
786 wakeup_channel_mgr = 0; 786 wakeup_channel_mgr = 0;
787 787
788 if (ch->delayed_chctl_flags) { 788 if (ch->delayed_chctl_flags) {
789 if (part->act_state != XPC_P_DEACTIVATING) { 789 if (part->act_state != XPC_P_AS_DEACTIVATING) {
790 spin_lock(&part->chctl_lock); 790 spin_lock(&part->chctl_lock);
791 part->chctl.flags[ch->number] |= 791 part->chctl.flags[ch->number] |=
792 ch->delayed_chctl_flags; 792 ch->delayed_chctl_flags;
@@ -846,7 +846,7 @@ xpc_do_exit(enum xp_retval reason)
846 part = &xpc_partitions[partid]; 846 part = &xpc_partitions[partid];
847 847
848 if (xpc_partition_disengaged(part) && 848 if (xpc_partition_disengaged(part) &&
849 part->act_state == XPC_P_INACTIVE) { 849 part->act_state == XPC_P_AS_INACTIVE) {
850 continue; 850 continue;
851 } 851 }
852 852
@@ -962,7 +962,7 @@ xpc_die_deactivate(void)
962 part = &xpc_partitions[partid]; 962 part = &xpc_partitions[partid];
963 963
964 if (xpc_partition_engaged(partid) || 964 if (xpc_partition_engaged(partid) ||
965 part->act_state != XPC_P_INACTIVE) { 965 part->act_state != XPC_P_AS_INACTIVE) {
966 xpc_request_partition_deactivation(part); 966 xpc_request_partition_deactivation(part);
967 xpc_indicate_partition_disengaged(part); 967 xpc_indicate_partition_disengaged(part);
968 } 968 }
@@ -1113,7 +1113,7 @@ xpc_init(void)
1113 1113
1114 part->activate_IRQ_rcvd = 0; 1114 part->activate_IRQ_rcvd = 0;
1115 spin_lock_init(&part->act_lock); 1115 spin_lock_init(&part->act_lock);
1116 part->act_state = XPC_P_INACTIVE; 1116 part->act_state = XPC_P_AS_INACTIVE;
1117 XPC_SET_REASON(part, 0, 0); 1117 XPC_SET_REASON(part, 0, 0);
1118 1118
1119 init_timer(&part->disengage_timer); 1119 init_timer(&part->disengage_timer);
@@ -1121,7 +1121,7 @@ xpc_init(void)
1121 xpc_timeout_partition_disengage; 1121 xpc_timeout_partition_disengage;
1122 part->disengage_timer.data = (unsigned long)part; 1122 part->disengage_timer.data = (unsigned long)part;
1123 1123
1124 part->setup_state = XPC_P_UNSET; 1124 part->setup_state = XPC_P_SS_UNSET;
1125 init_waitqueue_head(&part->teardown_wq); 1125 init_waitqueue_head(&part->teardown_wq);
1126 atomic_set(&part->references, 0); 1126 atomic_set(&part->references, 0);
1127 } 1127 }
diff --git a/drivers/misc/sgi-xp/xpc_partition.c b/drivers/misc/sgi-xp/xpc_partition.c
index f150dbfcfcc7..b5fb21641130 100644
--- a/drivers/misc/sgi-xp/xpc_partition.c
+++ b/drivers/misc/sgi-xp/xpc_partition.c
@@ -273,9 +273,9 @@ xpc_partition_disengaged(struct xpc_partition *part)
273 if (!in_interrupt()) 273 if (!in_interrupt())
274 del_singleshot_timer_sync(&part->disengage_timer); 274 del_singleshot_timer_sync(&part->disengage_timer);
275 275
276 DBUG_ON(part->act_state != XPC_P_DEACTIVATING && 276 DBUG_ON(part->act_state != XPC_P_AS_DEACTIVATING &&
277 part->act_state != XPC_P_INACTIVE); 277 part->act_state != XPC_P_AS_INACTIVE);
278 if (part->act_state != XPC_P_INACTIVE) 278 if (part->act_state != XPC_P_AS_INACTIVE)
279 xpc_wakeup_channel_mgr(part); 279 xpc_wakeup_channel_mgr(part);
280 280
281 xpc_cancel_partition_deactivation_request(part); 281 xpc_cancel_partition_deactivation_request(part);
@@ -295,8 +295,8 @@ xpc_mark_partition_active(struct xpc_partition *part)
295 dev_dbg(xpc_part, "setting partition %d to ACTIVE\n", XPC_PARTID(part)); 295 dev_dbg(xpc_part, "setting partition %d to ACTIVE\n", XPC_PARTID(part));
296 296
297 spin_lock_irqsave(&part->act_lock, irq_flags); 297 spin_lock_irqsave(&part->act_lock, irq_flags);
298 if (part->act_state == XPC_P_ACTIVATING) { 298 if (part->act_state == XPC_P_AS_ACTIVATING) {
299 part->act_state = XPC_P_ACTIVE; 299 part->act_state = XPC_P_AS_ACTIVE;
300 ret = xpSuccess; 300 ret = xpSuccess;
301 } else { 301 } else {
302 DBUG_ON(part->reason == xpSuccess); 302 DBUG_ON(part->reason == xpSuccess);
@@ -318,7 +318,7 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,
318 318
319 spin_lock_irqsave(&part->act_lock, irq_flags); 319 spin_lock_irqsave(&part->act_lock, irq_flags);
320 320
321 if (part->act_state == XPC_P_INACTIVE) { 321 if (part->act_state == XPC_P_AS_INACTIVE) {
322 XPC_SET_REASON(part, reason, line); 322 XPC_SET_REASON(part, reason, line);
323 spin_unlock_irqrestore(&part->act_lock, irq_flags); 323 spin_unlock_irqrestore(&part->act_lock, irq_flags);
324 if (reason == xpReactivating) { 324 if (reason == xpReactivating) {
@@ -327,7 +327,7 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,
327 } 327 }
328 return; 328 return;
329 } 329 }
330 if (part->act_state == XPC_P_DEACTIVATING) { 330 if (part->act_state == XPC_P_AS_DEACTIVATING) {
331 if ((part->reason == xpUnloading && reason != xpUnloading) || 331 if ((part->reason == xpUnloading && reason != xpUnloading) ||
332 reason == xpReactivating) { 332 reason == xpReactivating) {
333 XPC_SET_REASON(part, reason, line); 333 XPC_SET_REASON(part, reason, line);
@@ -336,7 +336,7 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,
336 return; 336 return;
337 } 337 }
338 338
339 part->act_state = XPC_P_DEACTIVATING; 339 part->act_state = XPC_P_AS_DEACTIVATING;
340 XPC_SET_REASON(part, reason, line); 340 XPC_SET_REASON(part, reason, line);
341 341
342 spin_unlock_irqrestore(&part->act_lock, irq_flags); 342 spin_unlock_irqrestore(&part->act_lock, irq_flags);
@@ -367,7 +367,7 @@ xpc_mark_partition_inactive(struct xpc_partition *part)
367 XPC_PARTID(part)); 367 XPC_PARTID(part));
368 368
369 spin_lock_irqsave(&part->act_lock, irq_flags); 369 spin_lock_irqsave(&part->act_lock, irq_flags);
370 part->act_state = XPC_P_INACTIVE; 370 part->act_state = XPC_P_AS_INACTIVE;
371 spin_unlock_irqrestore(&part->act_lock, irq_flags); 371 spin_unlock_irqrestore(&part->act_lock, irq_flags);
372 part->remote_rp_pa = 0; 372 part->remote_rp_pa = 0;
373} 373}
diff --git a/drivers/misc/sgi-xp/xpc_sn2.c b/drivers/misc/sgi-xp/xpc_sn2.c
index d34cdd533a9a..d1ccadc0857d 100644
--- a/drivers/misc/sgi-xp/xpc_sn2.c
+++ b/drivers/misc/sgi-xp/xpc_sn2.c
@@ -327,7 +327,7 @@ xpc_send_notify_IRQ_sn2(struct xpc_channel *ch, u8 chctl_flag,
327 union xpc_channel_ctl_flags chctl = { 0 }; 327 union xpc_channel_ctl_flags chctl = { 0 };
328 enum xp_retval ret; 328 enum xp_retval ret;
329 329
330 if (likely(part->act_state != XPC_P_DEACTIVATING)) { 330 if (likely(part->act_state != XPC_P_AS_DEACTIVATING)) {
331 chctl.flags[ch->number] = chctl_flag; 331 chctl.flags[ch->number] = chctl_flag;
332 ret = xpc_send_IRQ_sn2(part_sn2->remote_chctl_amo_va, 332 ret = xpc_send_IRQ_sn2(part_sn2->remote_chctl_amo_va,
333 chctl.all_flags, 333 chctl.all_flags,
@@ -975,7 +975,7 @@ xpc_identify_activate_IRQ_req_sn2(int nasid)
975 remote_vars->heartbeat, remote_vars->heartbeating_to_mask[0]); 975 remote_vars->heartbeat, remote_vars->heartbeating_to_mask[0]);
976 976
977 if (xpc_partition_disengaged(part) && 977 if (xpc_partition_disengaged(part) &&
978 part->act_state == XPC_P_INACTIVE) { 978 part->act_state == XPC_P_AS_INACTIVE) {
979 979
980 xpc_update_partition_info_sn2(part, remote_rp_version, 980 xpc_update_partition_info_sn2(part, remote_rp_version,
981 &remote_rp_ts_jiffies, 981 &remote_rp_ts_jiffies,
@@ -1257,10 +1257,10 @@ xpc_setup_infrastructure_sn2(struct xpc_partition *part)
1257 } 1257 }
1258 1258
1259 /* 1259 /*
1260 * With the setting of the partition setup_state to XPC_P_SETUP, we're 1260 * With the setting of the partition setup_state to XPC_P_SS_SETUP,
1261 * declaring that this partition is ready to go. 1261 * we're declaring that this partition is ready to go.
1262 */ 1262 */
1263 part->setup_state = XPC_P_SETUP; 1263 part->setup_state = XPC_P_SS_SETUP;
1264 1264
1265 /* 1265 /*
1266 * Setup the per partition specific variables required by the 1266 * Setup the per partition specific variables required by the
@@ -1323,8 +1323,8 @@ xpc_teardown_infrastructure_sn2(struct xpc_partition *part)
1323 1323
1324 DBUG_ON(atomic_read(&part->nchannels_engaged) != 0); 1324 DBUG_ON(atomic_read(&part->nchannels_engaged) != 0);
1325 DBUG_ON(atomic_read(&part->nchannels_active) != 0); 1325 DBUG_ON(atomic_read(&part->nchannels_active) != 0);
1326 DBUG_ON(part->setup_state != XPC_P_SETUP); 1326 DBUG_ON(part->setup_state != XPC_P_SS_SETUP);
1327 part->setup_state = XPC_P_WTEARDOWN; 1327 part->setup_state = XPC_P_SS_WTEARDOWN;
1328 1328
1329 xpc_vars_part_sn2[partid].magic = 0; 1329 xpc_vars_part_sn2[partid].magic = 0;
1330 1330
@@ -1338,7 +1338,7 @@ xpc_teardown_infrastructure_sn2(struct xpc_partition *part)
1338 1338
1339 /* now we can begin tearing down the infrastructure */ 1339 /* now we can begin tearing down the infrastructure */
1340 1340
1341 part->setup_state = XPC_P_TORNDOWN; 1341 part->setup_state = XPC_P_SS_TORNDOWN;
1342 1342
1343 /* in case we've still got outstanding timers registered... */ 1343 /* in case we've still got outstanding timers registered... */
1344 del_timer_sync(&part_sn2->dropped_notify_IRQ_timer); 1344 del_timer_sync(&part_sn2->dropped_notify_IRQ_timer);
@@ -1375,7 +1375,7 @@ xpc_pull_remote_cachelines_sn2(struct xpc_partition *part, void *dst,
1375 DBUG_ON((unsigned long)dst != L1_CACHE_ALIGN((unsigned long)dst)); 1375 DBUG_ON((unsigned long)dst != L1_CACHE_ALIGN((unsigned long)dst));
1376 DBUG_ON(cnt != L1_CACHE_ALIGN(cnt)); 1376 DBUG_ON(cnt != L1_CACHE_ALIGN(cnt));
1377 1377
1378 if (part->act_state == XPC_P_DEACTIVATING) 1378 if (part->act_state == XPC_P_AS_DEACTIVATING)
1379 return part->reason; 1379 return part->reason;
1380 1380
1381 ret = xp_remote_memcpy(xp_pa(dst), src_pa, cnt); 1381 ret = xp_remote_memcpy(xp_pa(dst), src_pa, cnt);
@@ -1534,7 +1534,7 @@ xpc_make_first_contact_sn2(struct xpc_partition *part)
1534 /* wait a 1/4 of a second or so */ 1534 /* wait a 1/4 of a second or so */
1535 (void)msleep_interruptible(250); 1535 (void)msleep_interruptible(250);
1536 1536
1537 if (part->act_state == XPC_P_DEACTIVATING) 1537 if (part->act_state == XPC_P_AS_DEACTIVATING)
1538 return part->reason; 1538 return part->reason;
1539 } 1539 }
1540 1540