[ewg] [PATCH ofed-1.2-rc3 1/4] ehca: backport for rhel-4.5 - use kmem_cache_t instead of struct kmem_cache

[Stefan Roscher]

Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
---
backport_ehca_1_2.6.9.patch |   82 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+)


diff -Nurp ofa_kernel-1.2_old/kernel_patches/backport/2.6.9_U5/backport_ehca_1_2.6.9.patch ofa_kernel-1.2_new/kernel_patches/backport/2.6.9_U5/backport_ehca_1_2.6.9.patch
--- ofa_kernel-1.2_old/kernel_patches/backport/2.6.9_U5/backport_ehca_1_2.6.9.patch	1970-01-01 01:00:00.000000000 +0100
+++ ofa_kernel-1.2_new/kernel_patches/backport/2.6.9_U5/backport_ehca_1_2.6.9.patch	2007-05-10 17:25:58.000000000 +0200
@@ -0,0 +1,82 @@
+diff -Nurp ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_av.c ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_av.c
+--- ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_av.c	2007-05-09 12:42:01.000000000 +0200
++++ ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_av.c	2007-05-09 12:42:34.000000000 +0200
+@@ -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 ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_cq.c ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_cq.c
+--- ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_cq.c	2007-05-09 12:42:01.000000000 +0200
++++ ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_cq.c	2007-05-09 12:42:34.000000000 +0200
+@@ -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 ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_main.c ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_main.c
+--- ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_main.c	2007-05-09 12:42:01.000000000 +0200
++++ ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_main.c	2007-05-09 12:42:34.000000000 +0200
+@@ -465,7 +465,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;						   \
+@@ -513,7 +512,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 ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_mrmw.c ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_mrmw.c
+--- ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_mrmw.c	2007-05-09 12:42:01.000000000 +0200
++++ ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_mrmw.c	2007-05-09 12:42:34.000000000 +0200
+@@ -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 ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_pd.c ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_pd.c
+--- ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_pd.c	2007-05-09 12:42:01.000000000 +0200
++++ ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_pd.c	2007-05-09 12:42:34.000000000 +0200
+@@ -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 ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_qp.c ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_qp.c
+--- ofa_kernel-1.2_old/drivers/infiniband/hw/ehca/ehca_qp.c	2007-05-09 12:42:01.000000000 +0200
++++ ofa_kernel-1.2_new/drivers/infiniband/hw/ehca/ehca_qp.c	2007-05-09 12:42:34.000000000 +0200
+@@ -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
+