Update <linux/malloc.h> to <linux/slab.h>.

diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index cbe8325..841f4be 100644 (file)
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -1,7 +1,7 @@
 #ifndef _OBD_SUPPORT
 #define _OBD_SUPPORT
 #include <linux/autoconf.h>
 #ifndef _OBD_SUPPORT
 #define _OBD_SUPPORT
 #include <linux/autoconf.h>

-#include <linux/malloc.h>
+#include <linux/slab.h>

 #include <linux/vmalloc.h>
 
 #define MIN(a,b) (((a)<(b)) ? (a): (b))
 #include <linux/vmalloc.h>
 
 #define MIN(a,b) (((a)<(b)) ? (a): (b))

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index 0ee1298..37072fa 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -37,7 +37,7 @@
 #include <linux/kmod.h>   /* for request_module() */
 #include <linux/sched.h>
 #include <linux/lp.h>
 #include <linux/kmod.h>   /* for request_module() */
 #include <linux/sched.h>
 #include <linux/lp.h>

-#include <linux/malloc.h>
+#include <linux/slab.h>

 #include <linux/ioport.h>
 #include <linux/fcntl.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/fcntl.h>
 #include <linux/delay.h>

diff --git a/lustre/obdclass/sysctl.c b/lustre/obdclass/sysctl.c
index 8e308b8..3944b03 100644 (file)
--- a/lustre/obdclass/sysctl.c
+++ b/lustre/obdclass/sysctl.c
@@ -6,7 +6,7 @@
 #include <linux/sysctl.h>
 #include <linux/swapctl.h>
 #include <linux/proc_fs.h>
 #include <linux/sysctl.h>
 #include <linux/swapctl.h>
 #include <linux/proc_fs.h>

-#include <linux/malloc.h>
+#include <linux/slab.h>

 #include <linux/stat.h>
 #include <linux/ctype.h>
 #include <asm/bitops.h>
 #include <linux/stat.h>
 #include <linux/ctype.h>
 #include <asm/bitops.h>

diff --git a/lustre/obdfs/sysctl.c b/lustre/obdfs/sysctl.c
index afbb4d6..be63d57 100644 (file)
--- a/lustre/obdfs/sysctl.c
+++ b/lustre/obdfs/sysctl.c
@@ -3,7 +3,7 @@
 #include <linux/sysctl.h>
 #include <linux/swapctl.h>
 #include <linux/proc_fs.h>
 #include <linux/sysctl.h>
 #include <linux/swapctl.h>
 #include <linux/proc_fs.h>

-#include <linux/malloc.h>
+#include <linux/slab.h>

 #include <linux/stat.h>
 #include <linux/ctype.h>
 #include <asm/bitops.h>
 #include <linux/stat.h>
 #include <linux/ctype.h>
 #include <asm/bitops.h>