Merge branch 'next' of ../next

[u-boot] / include / linux / mtd / compat.h

diff --git a/include/linux/mtd/compat.h b/include/linux/mtd/compat.h
index fe55087ea93602d61e2e620f5849ba47553fd72a..39c693f7a8c0a50ab1addfe1b90696908dd373e1 100644 (file)
--- a/include/linux/mtd/compat.h
+++ b/include/linux/mtd/compat.h
@@ -18,7 +18,16 @@
 #define KERN_DEBUG
 
 #define kmalloc(size, flags)   malloc(size)
+#define kzalloc(size, flags)   calloc(size, 1)
+#define vmalloc(size)          malloc(size)
 #define kfree(ptr)             free(ptr)
+#define vfree(ptr)             free(ptr)
+
+#define DECLARE_WAITQUEUE(...) do { } while (0)
+#define add_wait_queue(...)    do { } while (0)
+#define remove_wait_queue(...) do { } while (0)
+
+#define KERNEL_VERSION(a,b,c)  (((a) << 16) + ((b) << 8) + (c))
 
 /*
  * ..and if you can't take the strict
@@ -39,8 +48,5 @@
 #define BUG_ON(condition) do { if (condition) BUG(); } while(0)
 #endif /* BUG */
 
-#define likely(x)      __builtin_expect(!!(x), 1)
-#define unlikely(x)    __builtin_expect(!!(x), 0)
-
 #define PAGE_SIZE      4096
 #endif