1 files changed, 20 insertions, 20 deletions

diff --git a/include/asm-powerpc/iseries/it_lp_queue.h b/include/asm-powerpc/iseries/it_lp_queue.h
index b7c6fc12cce2..284c5a7db3ac 100644
--- a/include/asm-powerpc/iseries/it_lp_queue.h
+++ b/include/asm-powerpc/iseries/it_lp_queue.h
@@ -29,20 +29,20 @@
 
 struct HvLpEvent;
 
-#define ITMaxLpQueues   8
+#define IT_LP_MAX_QUEUES        8
 
-#define NotUsed         0       // Queue will not be used by PLIC
-#define DedicatedIo     1       // Queue dedicated to IO processor specified
-#define DedicatedLp     2       // Queue dedicated to LP specified
-#define Shared          3       // Queue shared for both IO and LP
+#define IT_LP_NOT_USED          0       /* Queue will not be used by PLIC */
+#define IT_LP_DEDICATED_IO      1       /* Queue dedicated to IO processor specified */
+#define IT_LP_DEDICATED_LP      2       /* Queue dedicated to LP specified */
+#define IT_LP_SHARED            3       /* Queue shared for both IO and LP */
 
-#define LpEventStackSize        4096
-#define LpEventMaxSize          256
-#define LpEventAlign            64
+#define IT_LP_EVENT_STACK_SIZE  4096
+#define IT_LP_EVENT_MAX_SIZE    256
+#define IT_LP_EVENT_ALIGN       64
 
 struct hvlpevent_queue {
 /*
- * The xSlicCurEventPtr is the pointer to the next event stack entry
+ * The hq_current_event is the pointer to the next event stack entry
  * that will become valid.  The OS must peek at this entry to determine
  * if it is valid.  PLIC will set the valid indicator as the very last
  * store into that entry.
@@ -52,23 +52,23 @@ struct hvlpevent_queue {
  * location again.
  *
  * If the event stack fills and there are overflow events, then PLIC
- * will set the xPlicOverflowIntPending flag in which case the OS will
+ * will set the hq_overflow_pending flag in which case the OS will
  * have to fetch the additional LP events once they have drained the
  * event stack.
  *
  * The first 16-bytes are known by both the OS and PLIC.  The remainder
  * of the cache line is for use by the OS.
  */
-        u8      xPlicOverflowIntPending;// 0x00 Overflow events are pending
-        u8      xPlicStatus;            // 0x01 DedicatedIo or DedicatedLp or NotUsed
-        u16     xSlicLogicalProcIndex;  // 0x02 Logical Proc Index for correlation
-        u8      xPlicRsvd[12];          // 0x04
-        char    *xSlicCurEventPtr;      // 0x10
-        char    *xSlicLastValidEventPtr; // 0x18
-        char    *xSlicEventStackPtr;    // 0x20
-        u8      xIndex;                 // 0x28 unique sequential index.
-        u8      xSlicRsvd[3];           // 0x29-2b
-        spinlock_t      lock;
+        u8              hq_overflow_pending;    /* 0x00 Overflow events are pending */
+        u8              hq_status;              /* 0x01 DedicatedIo or DedicatedLp or NotUsed */
+        u16             hq_proc_index;          /* 0x02 Logical Proc Index for correlation */
+        u8              hq_reserved1[12];       /* 0x04 */
+        char            *hq_current_event;      /* 0x10 */
+        char            *hq_last_event;         /* 0x18 */
+        char            *hq_event_stack;        /* 0x20 */
+        u8              hq_index;               /* 0x28 unique sequential index. */
+        u8              hq_reserved2[3];        /* 0x29-2b */
+        spinlock_t      hq_lock;
 };
 
 extern struct hvlpevent_queue hvlpevent_queue;