4 files changed, 55 insertions, 23 deletions

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index b4432332341f..c3f58f2f9f52 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -777,7 +777,6 @@ unsigned int irq_alloc_virt(struct irq_host *host,
 {
         unsigned long flags;
         unsigned int i, j, found = NO_IRQ;
-        unsigned int limit = irq_virq_count - count;
 
         if (count == 0 || count > (irq_virq_count - NUM_ISA_INTERRUPTS))
                 return NO_IRQ;
@@ -794,14 +793,16 @@ unsigned int irq_alloc_virt(struct irq_host *host,
         /* Look for count consecutive numbers in the allocatable
          * (non-legacy) space
          */
-        for (i = NUM_ISA_INTERRUPTS; i <= limit; ) {
-                for (j = i; j < (i + count); j++)
-                        if (irq_map[j].host != NULL) {
-                                i = j + 1;
-                                continue;
-                        }
-                found = i;
-                break;
+        for (i = NUM_ISA_INTERRUPTS, j = 0; i < irq_virq_count; i++) {
+                if (irq_map[i].host != NULL)
+                        j = 0;
+                else
+                        j++;
+
+                if (j == count) {
+                        found = i - count + 1;
+                        break;
+                }
         }
         if (found == NO_IRQ) {
                 spin_unlock_irqrestore(&irq_big_lock, flags);
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index dea75d73f983..975102a020d9 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -526,9 +526,7 @@ static void do_syscall_trace(void)
 
 void do_syscall_trace_enter(struct pt_regs *regs)
 {
-#ifdef CONFIG_PPC64
         secure_computing(regs->gpr[0]);
-#endif
 
         if (test_thread_flag(TIF_SYSCALL_TRACE)
             && (current->ptrace & PT_PTRACED))
@@ -548,12 +546,8 @@ void do_syscall_trace_enter(struct pt_regs *regs)
 
 void do_syscall_trace_leave(struct pt_regs *regs)
 {
-#ifdef CONFIG_PPC32
-        secure_computing(regs->gpr[0]);
-#endif
-
         if (unlikely(current->audit_context))
-                audit_syscall_exit((regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
+                audit_syscall_exit((regs->ccr&0x10000000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
                                    regs->result);
 
         if ((test_thread_flag(TIF_SYSCALL_TRACE)
@@ -561,8 +555,3 @@ void do_syscall_trace_leave(struct pt_regs *regs)
             && (current->ptrace & PT_PTRACED))
                 do_syscall_trace();
 }
-
-#ifdef CONFIG_PPC32
-EXPORT_SYMBOL(do_syscall_trace_enter);
-EXPORT_SYMBOL(do_syscall_trace_leave);
-#endif
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 406f308ddead..d45a168bdaca 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -25,8 +25,8 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
 /* SMT stuff */
 
 #ifdef CONFIG_PPC_MULTIPLATFORM
-/* default to snooze disabled */
-DEFINE_PER_CPU(unsigned long, smt_snooze_delay);
+/* Time in microseconds we delay before sleeping in the idle loop */
+DEFINE_PER_CPU(unsigned long, smt_snooze_delay) = { 100 };
 
 static ssize_t store_smt_snooze_delay(struct sys_device *dev, const char *buf,
                                       size_t count)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 8b278d85ca4e..85b9244a098c 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -1041,6 +1041,48 @@ void __init time_init(void)
         set_dec(tb_ticks_per_jiffy);
 }
 
+#ifdef CONFIG_RTC_CLASS
+static int set_rtc_class_time(struct rtc_time *tm)
+{
+        int err;
+        struct class_device *class_dev =
+                rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
+
+        if (class_dev == NULL)
+                return -ENODEV;
+
+        err = rtc_set_time(class_dev, tm);
+
+        rtc_class_close(class_dev);
+
+        return 0;
+}
+
+static void get_rtc_class_time(struct rtc_time *tm)
+{
+        int err;
+        struct class_device *class_dev =
+                rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
+
+        if (class_dev == NULL)
+                return;
+
+        err = rtc_read_time(class_dev, tm);
+
+        rtc_class_close(class_dev);
+
+        return;
+}
+
+int __init rtc_class_hookup(void)
+{
+        ppc_md.get_rtc_time = get_rtc_class_time;
+        ppc_md.set_rtc_time = set_rtc_class_time;
+
+        return 0;
+}
+#endif /* CONFIG_RTC_CLASS */
+
 
 #define FEBRUARY        2
 #define STARTOFTIME     1970