4 files changed, 24 insertions, 5 deletions

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 727a6699f2f4..c627cf86d1e3 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -239,7 +239,7 @@ static void snapshot_tb_and_purr(void *data)
         struct cpu_purr_data *p = &__get_cpu_var(cpu_purr_data);
 
         local_irq_save(flags);
-        p->tb = mftb();
+        p->tb = get_tb_or_rtc();
         p->purr = mfspr(SPRN_PURR);
         wmb();
         p->initialized = 1;
@@ -317,7 +317,7 @@ static void snapshot_purr(void)
  */
 void snapshot_timebase(void)
 {
-        __get_cpu_var(last_jiffy) = get_tb();
+        __get_cpu_var(last_jiffy) = get_tb_or_rtc();
         snapshot_purr();
 }
 
@@ -684,6 +684,8 @@ void timer_interrupt(struct pt_regs * regs)
 
                 write_seqlock(&xtime_lock);
                 tb_next_jiffy = tb_last_jiffy + tb_ticks_per_jiffy;
+                if (__USE_RTC() && tb_next_jiffy >= 1000000000)
+                        tb_next_jiffy -= 1000000000;
                 if (per_cpu(last_jiffy, cpu) >= tb_next_jiffy) {
                         tb_last_jiffy = tb_next_jiffy;
                         do_timer(1);
@@ -977,7 +979,7 @@ void __init time_init(void)
         tb_to_ns_scale = scale;
         tb_to_ns_shift = shift;
         /* Save the current timebase to pretty up CONFIG_PRINTK_TIME */
-        boot_tb = get_tb();
+        boot_tb = get_tb_or_rtc();
 
         tm = get_boot_time();
 
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index cef01e4e8989..213fa31ac537 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -98,6 +98,18 @@ static struct vdso_patch_def vdso_patches[] = {
                 CPU_FTR_USE_TB, 0,
                 "__kernel_gettimeofday", NULL
         },
+        {
+                CPU_FTR_USE_TB, 0,
+                "__kernel_clock_gettime", NULL
+        },
+        {
+                CPU_FTR_USE_TB, 0,
+                "__kernel_clock_getres", NULL
+        },
+        {
+                CPU_FTR_USE_TB, 0,
+                "__kernel_get_tbfreq", NULL
+        },
 };
 
 /*
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index c784edd40ea7..5bebe7fbe056 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -579,7 +579,7 @@ static struct spu *find_victim(struct spu_context *ctx)
                 list_for_each_entry(spu, &cbe_spu_info[node].spus, cbe_list) {
                         struct spu_context *tmp = spu->ctx;
 
-                        if (tmp->prio > ctx->prio &&
+                        if (tmp && tmp->prio > ctx->prio &&
                             (!victim || tmp->prio > victim->prio))
                                 victim = spu->ctx;
                 }
@@ -611,9 +611,9 @@ static struct spu *find_victim(struct spu_context *ctx)
 
                         mutex_lock(&cbe_spu_info[node].list_mutex);
                         cbe_spu_info[node].nr_active--;
+                        spu_unbind_context(spu, victim);
                         mutex_unlock(&cbe_spu_info[node].list_mutex);
 
-                        spu_unbind_context(spu, victim);
                         victim->stats.invol_ctx_switch++;
                         spu->stats.invol_ctx_switch++;
                         mutex_unlock(&victim->state_mutex);
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
index d7f5ddfbaac7..c104c15c6625 100644
--- a/include/asm-powerpc/time.h
+++ b/include/asm-powerpc/time.h
@@ -149,6 +149,11 @@ static inline u64 get_tb(void)
 }
 #endif /* !CONFIG_PPC64 */
 
+static inline u64 get_tb_or_rtc(void)
+{
+        return __USE_RTC() ? get_rtc() : get_tb();
+}
+
 static inline void set_tb(unsigned int upper, unsigned int lower)
 {
         mtspr(SPRN_TBWL, 0);