[CELL] spufs: add spu stats in sysfs and ctx stat file in spufs

This patch exports per-context statistics in spufs as long as spu
statistics in sysfs.

It was formed by merging:
"spufs: add spu stats in sysfs"   From: Christoph Hellwig
"spufs: add stat file to spufs"   From: Christoph Hellwig
"spufs: fix libassist accounting" From: Jeremy Kerr
"spusched: fix spu utilization statistics" From: Luke Browning
And some adjustments by myself, after suggestions on cbe-oss-dev.

Having separate patches was making the review process harder
than it should, as we end up integrating spus and ctx statistics
accounting much more than it was on the first implementation.

Signed-off-by: Andre Detsch <adetsch@br.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index a034f03b8107..12442acdc76f 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -107,10 +107,10 @@ struct spu_runqueue;
 struct device_node;
 
 enum spu_utilization_state {
-        SPU_UTIL_SYSTEM,
         SPU_UTIL_USER,
+        SPU_UTIL_SYSTEM,
         SPU_UTIL_IOWAIT,
-        SPU_UTIL_IDLE,
+        SPU_UTIL_IDLE_LOADED,
         SPU_UTIL_MAX
 };
 
@@ -167,9 +167,9 @@ struct spu {
 
         struct {
                 /* protected by interrupt reentrancy */
-                enum spu_utilization_state utilization_state;
-                unsigned long tstamp;           /* time of last ctx switch */
-                unsigned long times[SPU_UTIL_MAX];
+                enum spu_utilization_state util_state;
+                unsigned long long tstamp;
+                unsigned long long times[SPU_UTIL_MAX];
                 unsigned long long vol_ctx_switch;
                 unsigned long long invol_ctx_switch;
                 unsigned long long min_flt;