From 22487b0bb6a8013274f3e2a644a9848221568206 Mon Sep 17 00:00:00 2001
From: leonidk <leonidk@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Thu, 23 Oct 2008 13:40:22 +0000
Subject: [PATCH] [MLX4] added support to WPP. [mlnx:3348-9]

git-svn-id: svn://openib.tc.cornell.edu/gen1@1688 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 .../WOF2-0/trunk/hw/mlx4/kernel/bus/core/SOURCES    |  2 +-
 .../WOF2-0/trunk/hw/mlx4/kernel/bus/core/cache.c    |  1 +
 .../WOF2-0/trunk/hw/mlx4/kernel/bus/core/device.c   |  8 +++++---
 branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w.c |  7 +++++++
 .../trunk/hw/mlx4/kernel/bus/core/l2w_memory.c      |  1 +
 .../WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w_umem.c |  7 +++++++
 .../WOF2-0/trunk/hw/mlx4/kernel/bus/core/verbs.c    |  6 ++++--
 branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/drv.c  | 13 ++++++++-----
 branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/pdo.c  |  7 +++++--
 .../WOF2-0/trunk/hw/mlx4/kernel/bus/drv/precomp.h   | 10 +---------
 .../WOF2-0/trunk/hw/mlx4/kernel/bus/drv/sources     |  4 ++--
 branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/wmi.c  |  7 +++++--
 branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/SOURCES |  4 ++--
 branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/cq.c    |  8 ++++++++
 branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/mad.c   |  8 ++++++++
 .../WOF2-0/trunk/hw/mlx4/kernel/bus/net/SOURCES     |  4 ++--
 .../WOF2-0/trunk/hw/mlx4/kernel/bus/net/alloc.c     | 11 ++++++++++-
 branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/cq.c   |  9 +++++++++
 branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/main.c |  8 ++++++++
 branches/WOF2-0/trunk/hw/mlx4/kernel/hca/SOURCES    |  6 +++---
 .../trunk/hw/mlx4/kernel/hca/{verbs.c => hverbs.c}  |  2 +-
 .../trunk/hw/mlx4/kernel/hca/{verbs.h => hverbs.h}  |  0
 branches/WOF2-0/trunk/hw/mlx4/kernel/hca/precomp.h  |  2 +-
 .../WOF2-0/trunk/hw/mlx4/kernel/inc/mlx4_debug.h    |  6 +++---
 24 files changed, 102 insertions(+), 39 deletions(-)
 rename branches/WOF2-0/trunk/hw/mlx4/kernel/hca/{verbs.c => hverbs.c} (96%)
 rename branches/WOF2-0/trunk/hw/mlx4/kernel/hca/{verbs.h => hverbs.h} (100%)

diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/SOURCES b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/SOURCES
index e0cc75ca..fe394f67 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/SOURCES
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/SOURCES
@@ -5,7 +5,7 @@ TARGETTYPE=DRIVER_LIBRARY
 
 
 !if $(FREEBUILD)
-#ENABLE_EVENT_TRACING=1
+ENABLE_EVENT_TRACING=1
 !else
 #ENABLE_EVENT_TRACING=1
 !endif
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/cache.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/cache.c
index c41e9ae6..b3ddc348 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/cache.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/cache.c
@@ -37,6 +37,7 @@
 
 #include "ib\mlx4_ib.h"
 #include "ib_cache.h"
+#include <mlx4_debug.h>
 
 #if defined(EVENT_TRACING)
 #ifdef offsetof
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/device.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/device.c
index c68ae40e..d20b1105 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/device.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/device.c
@@ -33,6 +33,11 @@
  * $Id: device.c 1349 2004-12-16 21:09:43Z roland $
  */
 
+#include "l2w.h"
+#include "ib_verbs.h"
+#include "core.h"
+#include <mlx4_debug.h>
+
 #if defined(EVENT_TRACING)
 #ifdef offsetof
 #undef offsetof
@@ -40,9 +45,6 @@
 #include "device.tmh"
 #endif
 
-#include "l2w.h"
-#include "ib_verbs.h"
-#include "core.h"
 
 struct ib_client_data {
 	struct list_head  list;
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w.c
index d3a225e0..4b7599eb 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w.c
@@ -3,6 +3,13 @@
 #include "pa_cash.h"
 #include "mlx4.h"
 
+#if defined (EVENT_TRACING)
+#ifdef offsetof
+#undef offsetof
+#endif
+#include "l2w.tmh"
+#endif 
+
 /* Nth element of the table contains the index of the first set bit of N; 8 - for N=0 */
 char g_set_bit_tbl[256];
 
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w_memory.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w_memory.c
index bb0f8851..49b8c92d 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w_memory.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w_memory.c
@@ -34,6 +34,7 @@
  * $Id: mt_memory.c 2020 2007-05-01 09:29:10Z leonid $
  */
 #include "l2w.h"
+#include <mlx4_debug.h>
 
 #if defined (EVENT_TRACING)
 #ifdef offsetof
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w_umem.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w_umem.c
index 5a3d3078..245ca6bb 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w_umem.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/l2w_umem.c
@@ -2,6 +2,13 @@
 #include "l2w.h"
 #include "ib_verbs.h"
 
+#if defined (EVENT_TRACING)
+#ifdef offsetof
+#undef offsetof
+#endif
+#include "l2w_umem.tmh"
+#endif 
+
 /**
  * ib_umem_release - release memory pinned with ib_umem_get
  * @umem: umem struct to release
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/verbs.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/verbs.c
index fd9daa78..33e08f51 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/verbs.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/core/verbs.c
@@ -38,6 +38,10 @@
  * $Id: verbs.c 1349 2004-12-16 21:09:43Z roland $
  */
 
+#include "l2w.h"
+#include "ib_verbs.h"
+#include <mlx4_debug.h>
+
 #if defined(EVENT_TRACING)
 #ifdef offsetof
 #undef offsetof
@@ -45,8 +49,6 @@
 #include "device.tmh"
 #endif
 
-#include "l2w.h"
-#include "ib_verbs.h"
 
 // qp_state_table
 static struct {
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/drv.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/drv.c
index 23b9ef75..345205ec 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/drv.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/drv.c
@@ -22,7 +22,10 @@ Environment:
 #include <initguid.h>
 #include <wdmguid.h>
 
-#if defined(EVENT_TRACING)
+#if defined (EVENT_TRACING)
+#ifdef offsetof
+#undef offsetof
+#endif
 #include "drv.tmh"
 #endif 
 
@@ -570,20 +573,20 @@ __get_resources(
 						i, desc->ShareDisposition, desc->Flags,
 						desc->u.MessageInterrupt.Translated.Level, 
 						desc->u.MessageInterrupt.Translated.Vector, 
-						desc->u.MessageInterrupt.Translated.Affinity ));
+						(u32)desc->u.MessageInterrupt.Translated.Affinity ));
 					MLX4_PRINT(TRACE_LEVEL_WARNING, MLX4_DBG_DRV,
-						("EvtPrepareHardware: Desc %d: RawMsiInterrupt: Share %d, Flags %#x, MessageCount #hx, Vector %#x, Affinity %#x\n", 
+						("EvtPrepareHardware: Desc %d: RawMsiInterrupt: Share %d, Flags %#x, MessageCount %#hx, Vector %#x, Affinity %#x\n", 
 						i, desc_raw->ShareDisposition, desc_raw->Flags,
 						desc_raw->u.MessageInterrupt.Raw.MessageCount, 
 						desc_raw->u.MessageInterrupt.Raw.Vector,
-						desc_raw->u.MessageInterrupt.Raw.Affinity ));
+						(u32)desc_raw->u.MessageInterrupt.Raw.Affinity ));
 				}
 				else { // line-based interrupt
 					MLX4_PRINT(TRACE_LEVEL_WARNING, MLX4_DBG_DRV,
 						("EvtPrepareHardware: Desc %d: LineInterrupt: Share %d, Flags %#x, Level %d, Vector %#x, Affinity %#x\n", 
 						i, desc->ShareDisposition, desc->Flags,
 						desc->u.Interrupt.Level, desc->u.Interrupt.Vector, 
-						desc->u.Interrupt.Affinity ));
+						(u32)desc->u.Interrupt.Affinity ));
 				}
 				break;
 #endif
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/pdo.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/pdo.c
index 920cd476..826f834e 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/pdo.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/pdo.c
@@ -2,9 +2,12 @@
 #include <initguid.h>
 #include <wdmguid.h>
 
-#if defined(EVENT_TRACING)
-#include "pdo.tmh"
+#if defined (EVENT_TRACING)
+#ifdef offsetof
+#undef offsetof
 #endif
+#include "pdo.tmh"
+#endif 
 
 #ifdef ALLOC_PRAGMA
 #pragma alloc_text(PAGE, create_pdo)
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/precomp.h b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/precomp.h
index 9fbb31cd..eefec294 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/precomp.h
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/precomp.h
@@ -10,14 +10,6 @@
 #include "drv.h"
 #include "driver.h"
 #include "cmd.h"
-
-#if 0
-#include "mxe_hca.h"
-#include "mtnic_if_defs.h"
-#include "mxe_utils.h"
-#include "mxe_wpptrace.h"
-#include "mtnic_dev.h"
-#include "mxe_drv.h"
-#endif
+#include <mlx4_debug.h>
 
 
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/sources b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/sources
index 54d49820..00644b69 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/sources
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/sources
@@ -11,7 +11,7 @@ NTTARGETFILES=$(INF_TARGET)
 !endif
 
 !if $(FREEBUILD)
-#ENABLE_EVENT_TRACING=1
+ENABLE_EVENT_TRACING=1
 !else
 #ENABLE_EVENT_TRACING=1
 !endif
@@ -54,7 +54,7 @@ C_DEFINES = $(C_DEFINES) -DEVENT_TRACING
 
 RUN_WPP= $(SOURCES) -km -dll -ext: .c .cpp .h .C .CPP .H\
 #	-preserveext:.cpp .h\
-	-scan:..\inc\mlx4_debug.h \
+	-scan:..\..\inc\mlx4_debug.h \
 	-func:MLX4_PRINT(LEVEL,FLAGS,(MSG,...)) \
 	-func:MLX4_PRINT_EXIT(LEVEL,FLAGS,(MSG,...)) 
 !ENDIF
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/wmi.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/wmi.c
index e3faf50c..25323d46 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/wmi.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/drv/wmi.c
@@ -23,9 +23,12 @@ Environment:
 
 #include "precomp.h"
 
-#if defined(EVENT_TRACING)
-#include "wmi.tmh"
+#if defined (EVENT_TRACING)
+#ifdef offsetof
+#undef offsetof
 #endif
+#include "wmi.tmh"
+#endif 
 
 #ifdef ALLOC_PRAGMA
 #pragma alloc_text(PAGE,WmiRegistration)
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/SOURCES b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/SOURCES
index 7216a5ba..4a940f09 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/SOURCES
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/SOURCES
@@ -5,7 +5,7 @@ TARGETTYPE=DRIVER_LIBRARY
 
 
 !if $(FREEBUILD)
-#ENABLE_EVENT_TRACING=1
+ENABLE_EVENT_TRACING=1
 !else
 #ENABLE_EVENT_TRACING=1
 !endif
@@ -37,7 +37,7 @@ TARGETLIBS= \
 C_DEFINES = $(C_DEFINES) -DEVENT_TRACING
 
 RUN_WPP = $(SOURCES) -km -ext: .c .h .C .H \
-	-scan:..\inc\mlx4_debug.h \
+	-scan:..\..\inc\mlx4_debug.h \
 	-func:MLX4_PRINT(LEVEL,FLAGS,(MSG,...)) \
 	-func:MLX4_PRINT_EXIT(LEVEL,FLAGS,(MSG,...)) 
 !ENDIF
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/cq.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/cq.c
index 579d4794..2cedea6c 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/cq.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/cq.c
@@ -35,6 +35,14 @@
 #include "qp.h"
 #include "user.h"
 
+#if defined(EVENT_TRACING)
+#ifdef offsetof
+#undef offsetof
+#endif
+#include "cq.tmh"
+#endif
+
+
 static void mlx4_ib_cq_comp(struct mlx4_cq *cq)
 {
 	struct ib_cq *ibcq = &to_mibcq(cq)->ibcq;
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/mad.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/mad.c
index 01ba48cb..4a055d95 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/mad.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/ib/mad.c
@@ -36,6 +36,14 @@
 #include <ib_smi.h>
 #include "cmd.h"
 
+#if defined(EVENT_TRACING)
+#ifdef offsetof
+#undef offsetof
+#endif
+#include "mad.tmh"
+#endif
+
+
 enum {
 	MLX4_IB_VENDOR_CLASS1 = 0x9,
 	MLX4_IB_VENDOR_CLASS2 = 0xa
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/SOURCES b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/SOURCES
index e1c89e54..37441cf0 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/SOURCES
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/SOURCES
@@ -5,7 +5,7 @@ TARGETTYPE=DRIVER_LIBRARY
 
 
 !if $(FREEBUILD)
-#ENABLE_EVENT_TRACING=1
+ENABLE_EVENT_TRACING=1
 !else
 #ENABLE_EVENT_TRACING=1
 !endif
@@ -46,7 +46,7 @@ TARGETLIBS= \
 C_DEFINES = $(C_DEFINES) -DEVENT_TRACING
 
 RUN_WPP = $(SOURCES) -km -ext: .c .h .C .H \
-	-scan:..\mlx4_debug.h \
+	-scan:..\..\inc\mlx4_debug.h \
 	-func:MLX4_PRINT(LEVEL,FLAGS,(MSG,...)) \
 	-func:MLX4_PRINT_EXIT(LEVEL,FLAGS,(MSG,...)) 
 !ENDIF
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/alloc.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/alloc.c
index 62a074e6..52d999fe 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/alloc.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/alloc.c
@@ -31,6 +31,15 @@
  */
 
 #include "mlx4.h"
+#include <mlx4_debug.h>
+
+#if defined(EVENT_TRACING)
+#ifdef offsetof
+#undef offsetof
+#endif
+#include "alloc.tmh"
+#endif
+
 
 u32 mlx4_bitmap_alloc(struct mlx4_bitmap *bitmap)
 {
@@ -214,7 +223,7 @@ int mlx4_buf_alloc(struct mlx4_dev *dev, int size, int max_direct,
 			buf->npages *= 2;
 		}
 		MLX4_PRINT( TRACE_LEVEL_INFORMATION, MLX4_DBG_CQ,
-			("size %#x, nbufs %d, pages %d, page_shift %d, kva %p, da %llx, buf_size %#x\n",
+			("size %#x, nbufs %d, pages %d, page_shift %d, kva %p, da %I64x, buf_size %#x\n",
 			size, buf->nbufs, buf->npages, buf->page_shift, 
 			buf->u.direct.buf, t.da, t.sz ));
 		memset(buf->u.direct.buf, 0, size);
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/cq.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/cq.c
index 9fed0ade..3dab6b0d 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/cq.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/cq.c
@@ -38,6 +38,15 @@
 #include "cmd.h"
 #include "icm.h"
 #include "cq.h"
+#include <mlx4_debug.h>
+
+#if defined(EVENT_TRACING)
+#ifdef offsetof
+#undef offsetof
+#endif
+#include "cq.tmh"
+#endif
+
 
 #define MLX4_CQ_STATUS_OK		( 0 << 28)
 #define MLX4_CQ_STATUS_OVERFLOW		( 9 << 28)
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/main.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/main.c
index 3a1d92e5..1273d778 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/main.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/bus/net/main.c
@@ -40,6 +40,14 @@
 #include "device.h"
 #include "doorbell.h"
 #include "complib\cl_thread.h"
+#include <mlx4_debug.h>
+
+#if defined(EVENT_TRACING)
+#ifdef offsetof
+#undef offsetof
+#endif
+#include "main.tmh"
+#endif
 
 
 static struct mlx4_profile default_profile = {
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/SOURCES b/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/SOURCES
index ab9c2973..4a257917 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/SOURCES
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/SOURCES
@@ -17,7 +17,7 @@ ENABLE_EVENT_TRACING=1
 !endif
 
 SOURCES= \
-  	hca.rc			\
+	hca.rc			\
 	av.c			\
 	ca.c			\
 	cq.c			\
@@ -25,12 +25,12 @@ SOURCES= \
 	direct.c		\
 	drv.c			\
 	fw.c			\
-	mcast.c			\
+	mcast.c 		\
 	mr.c			\
 	pd.c			\
 	qp.c			\
 	srq.c			\
-	verbs.c			\
+	hverbs.c		\
 	vp.c			\
 	wmi.c			\
 
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/verbs.c b/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/hverbs.c
similarity index 96%
rename from branches/WOF2-0/trunk/hw/mlx4/kernel/hca/verbs.c
rename to branches/WOF2-0/trunk/hw/mlx4/kernel/hca/hverbs.c
index 44969d9e..4fcf5b14 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/verbs.c
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/hverbs.c
@@ -38,7 +38,7 @@
 #ifdef offsetof
 #undef offsetof
 #endif
-#include "verbs.tmh"
+#include "hverbs.tmh"
 #endif
 
 
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/verbs.h b/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/hverbs.h
similarity index 100%
rename from branches/WOF2-0/trunk/hw/mlx4/kernel/hca/verbs.h
rename to branches/WOF2-0/trunk/hw/mlx4/kernel/hca/hverbs.h
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/precomp.h b/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/precomp.h
index a2f8f995..1d316185 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/precomp.h
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/hca/precomp.h
@@ -39,7 +39,7 @@
 #include "public.h"
 #include "debug.h"
 #include "l2w.h"
-#include "verbs.h"
+#include "hverbs.h"
 #include "mlx4_ib.h"
 #include "drv.h"
 #include "mx_abi.h"
diff --git a/branches/WOF2-0/trunk/hw/mlx4/kernel/inc/mlx4_debug.h b/branches/WOF2-0/trunk/hw/mlx4/kernel/inc/mlx4_debug.h
index 76e8d2ef..d9b21bcb 100644
--- a/branches/WOF2-0/trunk/hw/mlx4/kernel/inc/mlx4_debug.h
+++ b/branches/WOF2-0/trunk/hw/mlx4/kernel/inc/mlx4_debug.h
@@ -93,7 +93,7 @@ end:
 	WPP_DEFINE_BIT( MLX4_DBG_INIT) \
 	WPP_DEFINE_BIT( MLX4_DBG_MAD) \
 	WPP_DEFINE_BIT( MLX4_DBG_PO) \
-	WPP_DEFINE_BIT( MLX4_DBG_PD)\
+	WPP_DEFINE_BIT( MLX4_DBG_PD) \
 	WPP_DEFINE_BIT( MLX4_DBG_CQ) \
 	WPP_DEFINE_BIT( MLX4_DBG_QP) \
 	WPP_DEFINE_BIT( MLX4_DBG_MEMORY) \
@@ -101,8 +101,8 @@ end:
 	WPP_DEFINE_BIT( MLX4_DBG_SRQ) \
 	WPP_DEFINE_BIT( MLX4_DBG_MCAST) \
 	WPP_DEFINE_BIT( MLX4_DBG_LOW) \
-	WPP_DEFINE_BIT( MLX4_DBG_SHIM)) \
-	WPP_DEFINE_BIT( MLX4_DBG_DRV))
+	WPP_DEFINE_BIT( MLX4_DBG_SHIM) \
+	WPP_DEFINE_BIT( MLX4_DBG_DRV) )
 
 
 #define WPP_GLOBALLOGGER
-- 
2.46.0