[openfabrics-ewg] [PATCH] ehca backport ehca_ofed_1.1_to_2_6_9.patch

[Hoang-Nam Nguyen]

Hi,
the patch below is required to compile/build ehca device driver for kernel 2.6.9, ppc64.
I did commit it into contrib/ibm/gen2/backport/2.6.9.
Thanks!
Nam Nguyen


Signed-off-by: Hoang-Nam Nguyen <hnguyen at de.ibm.com>
---


 ehca_av.c   |    2 +-
 ehca_cq.c   |    2 +-
 ehca_irq.c  |    6 ------
 ehca_main.c |    2 --
 ehca_mrmw.c |    4 ++--
 ehca_pd.c   |    2 +-
 ehca_qp.c   |    2 +-
 ehca_reqs.c |    2 +-
 8 files changed, 7 insertions(+), 15 deletions(-)


diff -Nurp linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_av.c linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_av.c
--- linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_av.c 2006-09-18 04:42:09.179909408 -0700
+++ linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_av.c 2006-09-18 04:43:45.401923176 -0700
@@ -48,7 +48,7 @@
 #include "ehca_iverbs.h"
 #include "hcp_if.h"
 
-static struct kmem_cache *av_cache;
+static kmem_cache_t *av_cache;
 
 struct ib_ah *ehca_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr)
 {
diff -Nurp linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_cq.c linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_cq.c
--- linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_cq.c 2006-09-18 04:42:09.169910928 -0700
+++ linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_cq.c 2006-09-18 04:43:45.361929256 -0700
@@ -50,7 +50,7 @@
 #include "ehca_irq.h"
 #include "hcp_if.h"
 
-static struct kmem_cache *cq_cache;
+static kmem_cache_t *cq_cache;
 
 int ehca_cq_assign_qp(struct ehca_cq *cq, struct ehca_qp *qp)
 {
diff -Nurp linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_irq.c linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_irq.c
--- linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_irq.c 2006-09-18 04:42:09.180909256 -0700
+++ linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_irq.c 2006-09-18 04:43:45.414921200 -0700
@@ -692,12 +692,6 @@ static int comp_pool_callback(struct not
   kthread_bind(cct->task, cpu);
   wake_up_process(cct->task);
   break;
- case CPU_DOWN_PREPARE:
-  ehca_gen_dbg("CPU: %x (CPU_DOWN_PREPARE)", cpu);
-  break;
- case CPU_DOWN_FAILED:
-  ehca_gen_dbg("CPU: %x (CPU_DOWN_FAILED)", cpu);
-  break;
  case CPU_DEAD:
   ehca_gen_dbg("CPU: %x (CPU_DEAD)", cpu);
   destroy_comp_task(pool, cpu);
diff -Nurp linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_main.c linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_main.c
--- linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_main.c 2006-09-18 04:42:09.174910168 -0700
+++ linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_main.c 2006-09-18 04:43:45.378926672 -0700
@@ -426,7 +426,6 @@ void ehca_remove_driver_sysfs(struct ibm
 
 #define EHCA_RESOURCE_ATTR(name)                                           \
 static ssize_t  ehca_show_##name(struct device *dev,                       \
-     struct device_attribute *attr,            \
      char *buf)                                \
 {            \
  struct ehca_shca *shca;         \
@@ -474,7 +473,6 @@ EHCA_RESOURCE_ATTR(max_pd);
 EHCA_RESOURCE_ATTR(max_ah);
 
 static ssize_t ehca_show_adapter_handle(struct device *dev,
-     struct device_attribute *attr,
      char *buf)
 {
  struct ehca_shca *shca = dev->driver_data;
diff -Nurp linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_mrmw.c linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_mrmw.c
--- linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_mrmw.c 2006-09-18 04:42:09.177909712 -0700
+++ linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_mrmw.c 2006-09-18 04:43:45.393924392 -0700
@@ -46,8 +46,8 @@
 #include "hcp_if.h"
 #include "hipz_hw.h"
 
-static struct kmem_cache *mr_cache;
-static struct kmem_cache *mw_cache;
+static kmem_cache_t *mr_cache;
+static kmem_cache_t *mw_cache;
 
 static struct ehca_mr *ehca_mr_new(void)
 {
diff -Nurp linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_pd.c linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_pd.c
--- linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_pd.c 2006-09-18 04:42:09.172910472 -0700
+++ linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_pd.c 2006-09-18 04:43:45.369928040 -0700
@@ -43,7 +43,7 @@
 #include "ehca_tools.h"
 #include "ehca_iverbs.h"
 
-static struct kmem_cache *pd_cache;
+static kmem_cache_t *pd_cache;
 
 struct ib_pd *ehca_alloc_pd(struct ib_device *device,
        struct ib_ucontext *context, struct ib_udata *udata)
diff -Nurp linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_qp.c linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_qp.c
--- linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_qp.c 2006-09-18 04:42:09.170910776 -0700
+++ linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_qp.c 2006-09-18 04:43:45.363928952 -0700
@@ -51,7 +51,7 @@
 #include "hcp_if.h"
 #include "hipz_fns.h"
 
-static struct kmem_cache *qp_cache;
+static kmem_cache_t *qp_cache;
 
 /*
  * attributes not supported by query qp
diff -Nurp linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_reqs.c linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_reqs.c
--- linux-2.6.9_orig/drivers/infiniband/hw/ehca/ehca_reqs.c 2006-09-18 04:42:09.171910624 -0700
+++ linux-2.6.9_work/drivers/infiniband/hw/ehca/ehca_reqs.c 2006-09-18 04:43:45.367928344 -0700
@@ -41,7 +41,7 @@
  */
 
 
-#include <asm-powerpc/system.h>
+#include <asm-ppc64/system.h>
 #include "ehca_classes.h"
 #include "ehca_tools.h"
 #include "ehca_qes.h"