summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthias Kaehlcke <matthias@kaehlcke.net>2009-12-22 23:05:45 +0100
committerWolfgang Denk <wd@denx.de>2010-01-18 00:28:27 +0100
commitb63815e31355b44e65899b361da1d8ef6940ab90 (patch)
treee80a0d6b4321b1efa5be27ddf2be852a39707db5 /include
parentc3d7eec6d88945dec0626cdd4f4a35cb5f83ef00 (diff)
downloadu-boot-imx-b63815e31355b44e65899b361da1d8ef6940ab90.zip
u-boot-imx-b63815e31355b44e65899b361da1d8ef6940ab90.tar.gz
u-boot-imx-b63815e31355b44e65899b361da1d8ef6940ab90.tar.bz2
move definition of macros likely and unlikely to compiler.h
the macros likely and unlikely were defined in include/linux/mtd/compat.h, but used in code not related to MTD. moved the macro definitions to compiler.h Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Diffstat (limited to 'include')
-rw-r--r--include/compiler.h3
-rw-r--r--include/linux/mtd/compat.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/include/compiler.h b/include/compiler.h
index e602cce..332618e 100644
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -125,4 +125,7 @@ typedef unsigned int uintptr_t;
/* compiler options */
#define uninitialized_var(x) x = x
+#define likely(x) __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
+
#endif
diff --git a/include/linux/mtd/compat.h b/include/linux/mtd/compat.h
index f0c8464..39c693f 100644
--- a/include/linux/mtd/compat.h
+++ b/include/linux/mtd/compat.h
@@ -48,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