Patches contributed by University of Minnesota

commit c4cb8ecca66e3f136f66b5b30ec189530290a9b9
Author: Dave C Boutcher <boutcher@cs.umn.edu>
Date:   Fri Feb 3 01:18:46 2006 -0600

    [PATCH] powerpc: return correct rtas status from ibm,suspend-me
    
    Correctly return the status from the RTAS call.  rtas_call expects
    to return the status as a return value.
    
    Signed-off-by: Dave Boutcher <sleddog@us.ibm.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index b7092a47064b..f9b34e3ccf5a 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -588,8 +588,8 @@ static void rtas_percpu_suspend_me(void *info)
 
 	if (rc == H_Continue) {
 		data->waiting = 0;
-		rtas_call(ibm_suspend_me_token, 0, 1,
-			  data->args->args);
+		data->args->args[data->args->nargs] =
+			rtas_call(ibm_suspend_me_token, 0, 1, NULL);
 	} else {
 		data->waiting = -EBUSY;
 		printk(KERN_ERR "Error on H_Join hypervisor call\n");