colibri_imx6: fix video stdout in default environment

[oweals/u-boot.git] / lib / linux_compat.c

diff --git a/lib/linux_compat.c b/lib/linux_compat.c
index a3d4675f7ed98cc2d7c05cb460138717abf7c470..c83426f59dc208fd51f53d1c3f447c52e955602b 100644 (file)
--- a/lib/linux_compat.c
+++ b/lib/linux_compat.c
@@ -1,5 +1,8 @@
 
 #include <common.h>
+#include <malloc.h>
+#include <memalign.h>
+#include <asm/cache.h>
 #include <linux/compat.h>
 
 struct p_current cur = {
@@ -16,19 +19,13 @@ unsigned long copy_from_user(void *dest, const void *src,
 
 void *kmalloc(size_t size, int flags)
 {
-       return memalign(ARCH_DMA_MINALIGN, size);
-}
+       void *p;
 
-void *kzalloc(size_t size, int flags)
-{
-       void *ptr = kmalloc(size, flags);
-       memset(ptr, 0, size);
-       return ptr;
-}
+       p = malloc_cache_aligned(size);
+       if (p && flags & __GFP_ZERO)
+               memset(p, 0, size);
 
-void *vzalloc(unsigned long size)
-{
-       return kzalloc(size, 0);
+       return p;
 }
 
 struct kmem_cache *get_mem(int element_sz)
@@ -43,5 +40,24 @@ struct kmem_cache *get_mem(int element_sz)
 
 void *kmem_cache_alloc(struct kmem_cache *obj, int flag)
 {
-       return memalign(ARCH_DMA_MINALIGN, obj->sz);
+       return malloc_cache_aligned(obj->sz);
+}
+
+/**
+ * kmemdup - duplicate region of memory
+ *
+ * @src: memory region to duplicate
+ * @len: memory region length
+ * @gfp: GFP mask to use
+ *
+ * Return: newly allocated copy of @src or %NULL in case of error
+ */
+void *kmemdup(const void *src, size_t len, gfp_t gfp)
+{
+       void *p;
+
+       p = kmalloc(len, gfp);
+       if (p)
+               memcpy(p, src, len);
+       return p;
 }