Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / include / linux / compat.h

diff --git a/include/linux/compat.h b/include/linux/compat.h
index fbebf910addd994d265d21c4fbaa0a2f48f4ccb1..8711fe2b48c46256fd1a7cd1b7535e77a7d0bd29 100644 (file)
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -4,6 +4,7 @@
 #include <malloc.h>
 #include <linux/types.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 
 struct unused {};
 typedef struct unused unused_t;
@@ -14,7 +15,22 @@ struct p_current{
 
 extern struct p_current *current;
 
-#define ndelay(x)      udelay(1)
+/* avoid conflict with <dm/device.h> */
+#ifdef dev_dbg
+#undef dev_dbg
+#endif
+#ifdef dev_vdbg
+#undef dev_vdbg
+#endif
+#ifdef dev_info
+#undef dev_info
+#endif
+#ifdef dev_err
+#undef dev_err
+#endif
+#ifdef dev_warn
+#undef dev_warn
+#endif
 
 #define dev_dbg(dev, fmt, args...)             \
        debug(fmt, ##args)
@@ -24,17 +40,8 @@ extern struct p_current *current;
        printf(fmt, ##args)
 #define dev_err(dev, fmt, args...)             \
        printf(fmt, ##args)
-#define printk printf
-#define printk_once    printf
-
-#define KERN_EMERG
-#define KERN_ALERT
-#define KERN_CRIT
-#define KERN_ERR
-#define KERN_WARNING
-#define KERN_NOTICE
-#define KERN_INFO
-#define KERN_DEBUG
+#define dev_warn(dev, fmt, args...)            \
+       printf(fmt, ##args)
 
 #define GFP_ATOMIC ((gfp_t) 0)
 #define GFP_KERNEL ((gfp_t) 0)
@@ -49,22 +56,47 @@ static inline void *kzalloc(size_t size, gfp_t flags)
 {
        return kmalloc(size, flags | __GFP_ZERO);
 }
+
+static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
+{
+       if (size != 0 && n > SIZE_MAX / size)
+               return NULL;
+       return kmalloc(n * size, flags | __GFP_ZERO);
+}
+
+static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
+{
+       return kmalloc_array(n, size, flags | __GFP_ZERO);
+}
+
 #define vmalloc(size)  kmalloc(size, 0)
 #define __vmalloc(size, flags, pgsz)   kmalloc(size, flags)
 static inline void *vzalloc(unsigned long size)
 {
        return kzalloc(size, 0);
 }
-#define kfree(ptr)     free(ptr)
-#define vfree(ptr)     free(ptr)
+static inline void kfree(const void *block)
+{
+       free((void *)block);
+}
+static inline void vfree(const void *addr)
+{
+       free((void *)addr);
+}
 
 struct kmem_cache { int sz; };
 
 struct kmem_cache *get_mem(int element_sz);
 #define kmem_cache_create(a, sz, c, d, e)      get_mem(sz)
 void *kmem_cache_alloc(struct kmem_cache *obj, int flag);
-#define kmem_cache_free(obj, size)     free(size)
-#define kmem_cache_destroy(obj)                free(obj)
+static inline void kmem_cache_free(struct kmem_cache *cachep, void *obj)
+{
+       free(obj);
+}
+static inline void kmem_cache_destroy(struct kmem_cache *cachep)
+{
+       free(cachep);
+}
 
 #define DECLARE_WAITQUEUE(...) do { } while (0)
 #define add_wait_queue(...)    do { } while (0)
@@ -72,17 +104,6 @@ void *kmem_cache_alloc(struct kmem_cache *obj, int flag);
 
 #define KERNEL_VERSION(a,b,c)  (((a) << 16) + ((b) << 8) + (c))
 
-#ifndef BUG
-#define BUG() do { \
-       printf("U-Boot BUG at %s:%d!\n", __FILE__, __LINE__); \
-} while (0)
-
-#define BUG_ON(condition) do { if (condition) BUG(); } while(0)
-#endif /* BUG */
-
-#define WARN_ON(x) if (x) {printf("WARNING in %s line %d\n" \
-                                 , __FILE__, __LINE__); }
-
 #define PAGE_SIZE      4096
 
 /* drivers/char/random.c */
@@ -104,12 +125,6 @@ static inline void led_trigger_unregister_simple(struct led_trigger *trigger) {}
 static inline void led_trigger_event(struct led_trigger *trigger,
                                        enum led_brightness event) {}
 
-/* include/linux/log2.h */
-static inline int is_power_of_2(unsigned long n)
-{
-       return (n != 0 && ((n & (n - 1)) == 0));
-}
-
 /* uapi/linux/limits.h */
 #define XATTR_LIST_MAX 65536   /* size of extended attribute namelist (64k) */
 
@@ -129,8 +144,6 @@ typedef unsigned long sector_t;
 typedef unsigned long blkcnt_t;
 #endif
 
-#define ENOTSUPP       524     /* Operation is not supported */
-
 /* module */
 #define THIS_MODULE            0
 #define try_module_get(...)    1
@@ -159,6 +172,8 @@ typedef unsigned long blkcnt_t;
 
 #define class_create(...)              __builtin_return_address(0)
 #define class_create_file(...)         0
+#define class_register(...)            0
+#define class_unregister(...)
 #define class_remove_file(...)
 #define class_destroy(...)
 #define misc_register(...)             0
@@ -171,6 +186,7 @@ typedef unsigned long blkcnt_t;
 
 #define dev_set_name(...)              do { } while (0)
 #define device_register(...)           0
+#define device_unregister(...)
 #define volume_sysfs_init(...)         0
 #define volume_sysfs_close(...)                do { } while (0)