[Pvfs2-cvs] commit by slang in pvfs2/src/kernel/linux-2.6: pvfs2-bufmap.c pvfs2-kernel.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/kernel/linux-2.6
In directory parlweb1:/tmp/cvs-serv4842/src/kernel/linux-2.6

Modified Files:
	pvfs2-bufmap.c pvfs2-kernel.h 
Log Message:
commit checks for kzalloc that older kernels don't support


Index: pvfs2-bufmap.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/pvfs2-bufmap.c,v
diff -p -u -r1.50 -r1.51
--- pvfs2-bufmap.c	2 Feb 2007 02:09:00 -0000	1.50
+++ pvfs2-bufmap.c	2 Feb 2007 02:40:12 -0000	1.51
@@ -63,7 +63,7 @@ static int initialize_bufmap_descriptors
     if (desc_array == NULL)
     {
         gossip_err("pvfs2: could not allocate %d bytes\n",
-                ndescs * sizeof(struct pvfs_bufmap_desc));
+		(int) (ndescs * sizeof(struct pvfs_bufmap_desc)));
         goto out1;
     }
     err = 0;

Index: pvfs2-kernel.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/pvfs2-kernel.h,v
diff -p -u -r1.140 -r1.141
--- pvfs2-kernel.h	22 Jan 2007 22:48:36 -0000	1.140
+++ pvfs2-kernel.h	2 Feb 2007 02:40:12 -0000	1.141
@@ -1262,6 +1262,21 @@ static inline unsigned int diff(struct t
     return ((end->tv_sec * 1000000) + end->tv_usec);
 }
 
+#ifndef HAVE_KZALLOC
+static inline void *kzalloc(size_t size, int flags)
+{
+	void * ptr;
+
+	ptr = kmalloc(size, flags);
+	if(!ptr)
+	{
+		return ptr;
+	}
+	memset(ptr, 0, size);
+	return ptr;
+}
+#endif
+
 #endif /* __PVFS2KERNEL_H */
 
 /* @} */