[PATCH] powerpc: vdso fixes (take #2)

This fixes various errors in the new functions added in the vDSO's,
I've now verified all functions on both 32 and 64 bits vDSOs. It also
fix a sign extension bug getting the initial time of day at boot that
could cause the monotonic clock value to be completely on bogus for
64 bits applications (with either the vDSO or the syscall) on
powermacs.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index 5947b21a8588..4c7682a65227 100644
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
@@ -102,7 +102,7 @@ static unsigned long from_rtc_time(struct rtc_time *tm)
 static unsigned long cuda_get_time(void)
 {
         struct adb_request req;
-        unsigned long now;
+        unsigned int now;
 
         if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_GET_TIME) < 0)
                 return 0;
@@ -113,7 +113,7 @@ static unsigned long cuda_get_time(void)
                        req.reply_len);
         now = (req.reply[3] << 24) + (req.reply[4] << 16)
                 + (req.reply[5] << 8) + req.reply[6];
-        return now - RTC_OFFSET;
+        return ((unsigned long)now) - RTC_OFFSET;
 }
 
 #define cuda_get_rtc_time(tm)   to_rtc_time(cuda_get_time(), (tm))
@@ -146,7 +146,7 @@ static int cuda_set_rtc_time(struct rtc_time *tm)
 static unsigned long pmu_get_time(void)
 {
         struct adb_request req;
-        unsigned long now;
+        unsigned int now;
 
         if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0)
                 return 0;
@@ -156,7 +156,7 @@ static unsigned long pmu_get_time(void)
                        req.reply_len);
         now = (req.reply[0] << 24) + (req.reply[1] << 16)
                 + (req.reply[2] << 8) + req.reply[3];
-        return now - RTC_OFFSET;
+        return ((unsigned long)now) - RTC_OFFSET;
 }
 
 #define pmu_get_rtc_time(tm)    to_rtc_time(pmu_get_time(), (tm))