LU-2675 cleanup: remove unused mkdirdeep.c and lltrace.h

[fs/lustre-release.git] / libcfs / include / libcfs / user-mem.h

diff --git a/libcfs/include/libcfs/user-mem.h b/libcfs/include/libcfs/user-mem.h
index 7c5a1ef..e48b124 100644 (file)
--- a/libcfs/include/libcfs/user-mem.h
+++ b/libcfs/include/libcfs/user-mem.h
@@ -1,3 +1,25 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.  A copy is
+ * included in the COPYING file that accompanied this code.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * GPL HEADER END
+ */
+
 #ifndef __LIBCFS_USER_MEM_H__
 #define __LIBCFS_USER_MEM_H__
 
@@ -76,7 +98,7 @@ typedef struct {
 } cfs_mem_cache_t;
 
 #define CFS_SLAB_HWCACHE_ALIGN 0
-#define CFS_SLAB_DESTROY_BY_RCU 0
+#define SLAB_DESTROY_BY_RCU 0
 #define CFS_SLAB_KERNEL 0
 #define CFS_SLAB_NOFS 0
 
@@ -88,6 +110,20 @@ void cfs_mem_cache_free(cfs_mem_cache_t *c, void *addr);
 int cfs_mem_is_in_cache(const void *addr, const cfs_mem_cache_t *kmem);
 
 /*
+ * NUMA allocators
+ */
+#define cfs_cpt_malloc(cptab, cpt, bytes, flags)       \
+       cfs_alloc(bytes, flags)
+#define cfs_cpt_vmalloc(cptab, cpt, bytes)             \
+       cfs_alloc(bytes)
+#define cfs_page_cpt_alloc(cptab, cpt, mask)           \
+       cfs_alloc_page(mask)
+#define cfs_mem_cache_cpt_alloc(cache, cptab, cpt, gfp)        \
+       cfs_mem_cache_alloc(cache, gfp)
+
+#define smp_rmb()      do {} while (0)
+
+/*
  * Copy to/from user
  */
 static inline int cfs_copy_from_user(void *a,void *b, int c)