Merge branch 'merge'

3 files changed, 29 insertions, 2 deletions

diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c
index 95b36430aa0f..b47fcc5ddb78 100644
--- a/arch/powerpc/platforms/cell/spu_callbacks.c
+++ b/arch/powerpc/platforms/cell/spu_callbacks.c
@@ -258,6 +258,7 @@ void *spu_syscall_table[] = {
         [__NR_futex]                    sys_futex,
         [__NR_sched_setaffinity]        sys_sched_setaffinity,
         [__NR_sched_getaffinity]        sys_sched_getaffinity,
+        [224]                           sys_ni_syscall,
         [__NR_tuxcall]                  sys_ni_syscall,
         [226]                           sys_ni_syscall,
         [__NR_io_setup]                 sys_io_setup,
@@ -332,19 +333,21 @@ void *spu_syscall_table[] = {
         [__NR_readlinkat]               sys_readlinkat,
         [__NR_fchmodat]                 sys_fchmodat,
         [__NR_faccessat]                sys_faccessat,
+        [__NR_get_robust_list]          sys_get_robust_list,
+        [__NR_set_robust_list]          sys_set_robust_list,
 };
 
 long spu_sys_callback(struct spu_syscall_block *s)
 {
         long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6);
 
-        syscall = spu_syscall_table[s->nr_ret];
-
         if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) {
                 pr_debug("%s: invalid syscall #%ld", __FUNCTION__, s->nr_ret);
                 return -ENOSYS;
         }
 
+        syscall = spu_syscall_table[s->nr_ret];
+
 #ifdef DEBUG
         print_symbol(KERN_DEBUG "SPU-syscall %s:", (unsigned long)syscall);
         printk("syscall%ld(%lx, %lx, %lx, %lx, %lx, %lx)\n",
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index df2343e1956b..c896ce83d412 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -1157,6 +1157,7 @@ EXPORT_SYMBOL_GPL(pmac_i2c_xfer);
 /* some quirks for platform function decoding */
 enum {
         pmac_i2c_quirk_invmask = 0x00000001u,
+        pmac_i2c_quirk_skip = 0x00000002u,
 };
 
 static void pmac_i2c_devscan(void (*callback)(struct device_node *dev,
@@ -1172,6 +1173,15 @@ static void pmac_i2c_devscan(void (*callback)(struct device_node *dev,
                 /* XXX Study device-tree's & apple drivers are get the quirks
                  * right !
                  */
+                /* Workaround: It seems that running the clockspreading
+                 * properties on the eMac will cause lockups during boot.
+                 * The machine seems to work fine without that. So for now,
+                 * let's make sure i2c-hwclock doesn't match about "imic"
+                 * clocks and we'll figure out if we really need to do
+                 * something special about those later.
+                 */
+                { "i2c-hwclock", "imic5002", pmac_i2c_quirk_skip },
+                { "i2c-hwclock", "imic5003", pmac_i2c_quirk_skip },
                 { "i2c-hwclock", NULL, pmac_i2c_quirk_invmask },
                 { "i2c-cpu-voltage", NULL, 0},
                 {  "temp-monitor", NULL, 0 },
@@ -1198,6 +1208,8 @@ static void pmac_i2c_devscan(void (*callback)(struct device_node *dev,
                                 if (p->compatible &&
                                     !device_is_compatible(np, p->compatible))
                                         continue;
+                                if (p->quirks & pmac_i2c_quirk_skip)
+                                        break;
                                 callback(np, p->quirks);
                                 break;
                         }
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 4d15e396655c..b9200fb07815 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -463,11 +463,23 @@ static int pmac_pm_finish(suspend_state_t state)
         return 0;
 }
 
+static int pmac_pm_valid(suspend_state_t state)
+{
+        switch (state) {
+        case PM_SUSPEND_DISK:
+                return 1;
+        /* can't do any other states via generic mechanism yet */
+        default:
+                return 0;
+        }
+}
+
 static struct pm_ops pmac_pm_ops = {
         .pm_disk_mode   = PM_DISK_SHUTDOWN,
         .prepare        = pmac_pm_prepare,
         .enter          = pmac_pm_enter,
         .finish         = pmac_pm_finish,
+        .valid          = pmac_pm_valid,
 };
 
 #endif /* CONFIG_SOFTWARE_SUSPEND */