1 files changed, 15 insertions, 4 deletions

diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index e73ea00efd8b..ffa4df083609 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -115,10 +115,10 @@ struct spu {
         struct spu_priv2 __iomem *priv2;
         struct list_head list;
         struct list_head sched_list;
+        struct list_head full_list;
         int number;
         int nid;
         unsigned int irqs[3];
-        u32 isrc;
         u32 node;
         u64 flags;
         u64 dar;
@@ -144,6 +144,8 @@ struct spu {
         char irq_c1[8];
         char irq_c2[8];
 
+        struct device_node *devnode;
+
         struct sys_device sysdev;
 };
 
@@ -182,8 +184,10 @@ extern struct spufs_calls {
  */
 #define SPU_CREATE_EVENTS_ENABLED       0x0001
 #define SPU_CREATE_GANG                 0x0002
+#define SPU_CREATE_NOSCHED              0x0004
+#define SPU_CREATE_ISOLATE              0x0008
 
-#define SPU_CREATE_FLAG_ALL             0x0003 /* mask of all valid flags */
+#define SPU_CREATE_FLAG_ALL             0x000f /* mask of all valid flags */
 
 
 #ifdef CONFIG_SPU_FS_MODULE
@@ -199,6 +203,12 @@ static inline void unregister_spu_syscalls(struct spufs_calls *calls)
 }
 #endif /* MODULE */
 
+int spu_add_sysdev_attr(struct sysdev_attribute *attr);
+void spu_remove_sysdev_attr(struct sysdev_attribute *attr);
+
+int spu_add_sysdev_attr_group(struct attribute_group *attrs);
+void spu_remove_sysdev_attr_group(struct attribute_group *attrs);
+
 
 /*
  * Notifier blocks:
@@ -277,6 +287,7 @@ struct spu_problem {
         u32 spu_runcntl_RW;                                     /* 0x401c */
 #define SPU_RUNCNTL_STOP        0L
 #define SPU_RUNCNTL_RUNNABLE    1L
+#define SPU_RUNCNTL_ISOLATE     2L
         u8  pad_0x4020_0x4024[0x4];                             /* 0x4020 */
         u32 spu_status_R;                                       /* 0x4024 */
 #define SPU_STOP_STATUS_SHIFT           16
@@ -289,8 +300,8 @@ struct spu_problem {
 #define SPU_STATUS_INVALID_INSTR        0x20
 #define SPU_STATUS_INVALID_CH           0x40
 #define SPU_STATUS_ISOLATED_STATE       0x80
-#define SPU_STATUS_ISOLATED_LOAD_STAUTUS 0x200
-#define SPU_STATUS_ISOLATED_EXIT_STAUTUS 0x400
+#define SPU_STATUS_ISOLATED_LOAD_STATUS 0x200
+#define SPU_STATUS_ISOLATED_EXIT_STATUS 0x400
         u8  pad_0x4028_0x402c[0x4];                             /* 0x4028 */
         u32 spu_spe_R;                                          /* 0x402c */
         u8  pad_0x4030_0x4034[0x4];                             /* 0x4030 */