Merge Linux 2.6.23

2 files changed, 6 insertions, 1 deletions

diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index 8836c0f1f2f7..5bde3980bf49 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -130,6 +130,7 @@ struct spu {
         u64 flags;
         u64 dar;
         u64 dsisr;
+        u64 class_0_pending;
         size_t ls_size;
         unsigned int slb_replace;
         struct mm_struct *mm;
@@ -138,7 +139,6 @@ struct spu {
         unsigned long long timestamp;
         pid_t pid;
         pid_t tgid;
-        int class_0_pending;
         spinlock_t register_lock;
 
         void (* wbox_callback)(struct spu *spu);
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);