diff options
Diffstat (limited to 'arch/powerpc/kernel/rtas.c')
| -rw-r--r-- | arch/powerpc/kernel/rtas.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 06636c927a7e..0112318213ab 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
| @@ -578,18 +578,18 @@ static void rtas_percpu_suspend_me(void *info) | |||
| 578 | * We use "waiting" to indicate our state. As long | 578 | * We use "waiting" to indicate our state. As long |
| 579 | * as it is >0, we are still trying to all join up. | 579 | * as it is >0, we are still trying to all join up. |
| 580 | * If it goes to 0, we have successfully joined up and | 580 | * If it goes to 0, we have successfully joined up and |
| 581 | * one thread got H_Continue. If any error happens, | 581 | * one thread got H_CONTINUE. If any error happens, |
| 582 | * we set it to <0. | 582 | * we set it to <0. |
| 583 | */ | 583 | */ |
| 584 | local_irq_save(flags); | 584 | local_irq_save(flags); |
| 585 | do { | 585 | do { |
| 586 | rc = plpar_hcall_norets(H_JOIN); | 586 | rc = plpar_hcall_norets(H_JOIN); |
| 587 | smp_rmb(); | 587 | smp_rmb(); |
| 588 | } while (rc == H_Success && data->waiting > 0); | 588 | } while (rc == H_SUCCESS && data->waiting > 0); |
| 589 | if (rc == H_Success) | 589 | if (rc == H_SUCCESS) |
| 590 | goto out; | 590 | goto out; |
| 591 | 591 | ||
| 592 | if (rc == H_Continue) { | 592 | if (rc == H_CONTINUE) { |
| 593 | data->waiting = 0; | 593 | data->waiting = 0; |
| 594 | data->args->args[data->args->nargs] = | 594 | data->args->args[data->args->nargs] = |
| 595 | rtas_call(ibm_suspend_me_token, 0, 1, NULL); | 595 | rtas_call(ibm_suspend_me_token, 0, 1, NULL); |
| @@ -597,7 +597,7 @@ static void rtas_percpu_suspend_me(void *info) | |||
| 597 | plpar_hcall_norets(H_PROD,i); | 597 | plpar_hcall_norets(H_PROD,i); |
| 598 | } else { | 598 | } else { |
| 599 | data->waiting = -EBUSY; | 599 | data->waiting = -EBUSY; |
| 600 | printk(KERN_ERR "Error on H_Join hypervisor call\n"); | 600 | printk(KERN_ERR "Error on H_JOIN hypervisor call\n"); |
| 601 | } | 601 | } |
| 602 | 602 | ||
| 603 | out: | 603 | out: |
| @@ -624,7 +624,7 @@ static int rtas_ibm_suspend_me(struct rtas_args *args) | |||
| 624 | printk(KERN_ERR "Error doing global join\n"); | 624 | printk(KERN_ERR "Error doing global join\n"); |
| 625 | 625 | ||
| 626 | /* Prod each CPU. This won't hurt, and will wake | 626 | /* Prod each CPU. This won't hurt, and will wake |
| 627 | * anyone we successfully put to sleep with H_Join | 627 | * anyone we successfully put to sleep with H_JOIN. |
| 628 | */ | 628 | */ |
| 629 | for_each_possible_cpu(i) | 629 | for_each_possible_cpu(i) |
| 630 | plpar_hcall_norets(H_PROD, i); | 630 | plpar_hcall_norets(H_PROD, i); |
