1 files changed, 4 insertions, 19 deletions

diff --git a/drivers/misc/sgi-gru/gruhandles.h b/drivers/misc/sgi-gru/gruhandles.h
index 1ed74d7508c8..03b76a1993c3 100644
--- a/drivers/misc/sgi-gru/gruhandles.h
+++ b/drivers/misc/sgi-gru/gruhandles.h
@@ -251,15 +251,14 @@ struct gru_tlb_fault_handle {
         unsigned int fill1:9;
 
         unsigned int status:2;
-        unsigned int fill2:1;
-        unsigned int color:1;
+        unsigned int fill2:2;
         unsigned int state:3;
         unsigned int fill3:1;
 
-        unsigned int cause:7;           /* DW 0 - high 32 */
+        unsigned int cause:7;
         unsigned int fill4:1;
 
-        unsigned int indexway:12;
+        unsigned int indexway:12;       /* DW 0 - high 32 */
         unsigned int fill5:4;
 
         unsigned int ctxnum:4;
@@ -457,21 +456,7 @@ enum gru_cbr_state {
         CBRSTATE_BUSY_INTERRUPT,
 };
 
-/* CBE cbrexecstatus bits */
-#define CBR_EXS_ABORT_OCC_BIT                   0
-#define CBR_EXS_INT_OCC_BIT                     1
-#define CBR_EXS_PENDING_BIT                     2
-#define CBR_EXS_QUEUED_BIT                      3
-#define CBR_EXS_TLBHW_BIT                       4
-#define CBR_EXS_EXCEPTION_BIT                   5
-
-#define CBR_EXS_ABORT_OCC                       (1 << CBR_EXS_ABORT_OCC_BIT)
-#define CBR_EXS_INT_OCC                         (1 << CBR_EXS_INT_OCC_BIT)
-#define CBR_EXS_PENDING                         (1 << CBR_EXS_PENDING_BIT)
-#define CBR_EXS_QUEUED                          (1 << CBR_EXS_QUEUED_BIT)
-#define CBR_EXS_TLBHW                           (1 << CBR_EXS_TLBHW_BIT)
-#define CBR_EXS_EXCEPTION                       (1 << CBR_EXS_EXCEPTION_BIT)
-
+/* CBE cbrexecstatus bits  - defined in gru_instructions.h*/
 /* CBE ecause bits  - defined in gru_instructions.h */
 
 /*