Branch: HEAD

[fs/lustre-release.git] / lustre / include / linux / obd_support.h

diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index 6653615..0d2d445 100644 (file)
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -443,7 +443,12 @@ do {
 # define OBD_GFP_MASK GFP_NOFS
 #endif
 
+#ifdef __KERNEL__
 #define OBD_ALLOC(ptr, size) OBD_ALLOC_GFP(ptr, size, OBD_GFP_MASK)
+#else
+#define OBD_ALLOC(ptr, size) (ptr = malloc(size))
+#endif
+
 #define OBD_ALLOC_WAIT(ptr, size) OBD_ALLOC_GFP(ptr, size, GFP_KERNEL)
 
 #ifdef __arch_um__
@@ -482,6 +487,7 @@ do {
 #define POISON_PAGE(page, val) do { } while (0)
 #endif
 
+#ifdef __KERNEL__
 #define OBD_FREE(ptr, size)                                                          \
 do {                                                                                 \
         LASSERT(ptr);                                                                \
@@ -493,6 +499,9 @@ do {
         kfree(ptr);                                                                  \
         (ptr) = (void *)0xdeadbeef;                                                  \
 } while (0)
+#else
+#define OBD_FREE(ptr, size) ((void)(size), free((ptr)))
+#endif
 
 #ifdef __arch_um__
 # define OBD_VFREE(ptr, size) OBD_FREE(ptr, size)