VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / arch / ppc64 / kernel / rtas_flash.c

diff --git a/arch/ppc64/kernel/rtas_flash.c b/arch/ppc64/kernel/rtas_flash.c
index e9d21eb..aac9e96 100644 (file)
--- a/arch/ppc64/kernel/rtas_flash.c
+++ b/arch/ppc64/kernel/rtas_flash.c
@@ -344,8 +344,8 @@ static void manage_flash(struct rtas_manage_flash_t *args_buf)
        s32 rc;
 
        while (1) {
-               rc = (s32) rtas_call(rtas_token("ibm,manage-flash-image"), 1, 
-                               1, NULL, (long) args_buf->op);
+               rc = rtas_call(rtas_token("ibm,manage-flash-image"), 1, 
+                              1, NULL, args_buf->op);
                if (rc == RTAS_RC_BUSY)
                        udelay(1);
                else if (rtas_is_extended_busy(rc)) {
@@ -429,15 +429,15 @@ static void validate_flash(struct rtas_validate_flash_t *args_buf)
 {
        int token = rtas_token("ibm,validate-flash-image");
        unsigned int wait_time;
-       long update_results;
+       int update_results;
        s32 rc; 
 
        rc = 0;
        while(1) {
                spin_lock(&rtas_data_buf_lock);
                memcpy(rtas_data_buf, args_buf->buf, VALIDATE_BUF_SIZE);
-               rc = (s32) rtas_call(token, 2, 2, &update_results, 
-                                    __pa(rtas_data_buf), args_buf->buf_size);
+               rc = rtas_call(token, 2, 2, &update_results, 
+                              (u32) __pa(rtas_data_buf), args_buf->buf_size);
                memcpy(args_buf->buf, rtas_data_buf, VALIDATE_BUF_SIZE);
                spin_unlock(&rtas_data_buf_lock);
                        
@@ -451,7 +451,7 @@ static void validate_flash(struct rtas_validate_flash_t *args_buf)
        }
 
        args_buf->status = rc;
-       args_buf->update_results = (u32) update_results;
+       args_buf->update_results = update_results;
 }
 
 static int get_validate_flash_msg(struct rtas_validate_flash_t *args_buf,