projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: move BUILD_BUG_ON define to common.h
[oweals/u-boot.git]
/
include
/
ubi_uboot.h
diff --git
a/include/ubi_uboot.h
b/include/ubi_uboot.h
index 74312abf0394fbbe2f7c0d151080a1aef8933acf..69006e250accd4e28ccec0594bc528b9d2809415 100644
(file)
--- a/
include/ubi_uboot.h
+++ b/
include/ubi_uboot.h
@@
-15,6
+15,7
@@
#define __UBOOT_UBI_H
#include <common.h>
#define __UBOOT_UBI_H
#include <common.h>
+#include <compiler.h>
#include <malloc.h>
#include <div64.h>
#include <linux/crc32.h>
#include <malloc.h>
#include <div64.h>
#include <linux/crc32.h>
@@
-51,9
+52,6
@@
do { \
#undef CONFIG_MTD_UBI_DEBUG_MSG_BLD
#define CONFIG_MTD_UBI_DEBUG_DISABLE_BGT
#undef CONFIG_MTD_UBI_DEBUG_MSG_BLD
#define CONFIG_MTD_UBI_DEBUG_DISABLE_BGT
-/* compiler options */
-#define uninitialized_var(x) x = x
-
/* build.c */
#define get_device(...)
#define put_device(...)
/* build.c */
#define get_device(...)
#define put_device(...)
@@
-125,7
+123,7
@@
typedef int wait_queue_head_t;
#define init_rwsem(...) do { } while (0)
#define down_read(...) do { } while (0)
#define down_write(...) do { } while (0)
#define init_rwsem(...) do { } while (0)
#define down_read(...) do { } while (0)
#define down_write(...) do { } while (0)
-#define down_write_trylock(...)
0
+#define down_write_trylock(...)
1
#define up_read(...) do { } while (0)
#define up_write(...) do { } while (0)
#define up_read(...) do { } while (0)
#define up_write(...) do { } while (0)
@@
-193,9
+191,6
@@
static inline long IS_ERR(const void *ptr)
return IS_ERR_VALUE((unsigned long)ptr);
}
return IS_ERR_VALUE((unsigned long)ptr);
}
-/* Force a compilation error if condition is true */
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-
/* module */
#define THIS_MODULE 0
#define try_module_get(...) 1
/* module */
#define THIS_MODULE 0
#define try_module_get(...) 1