From b63815e31355b44e65899b361da1d8ef6940ab90 Mon Sep 17 00:00:00 2001
From: Matthias Kaehlcke <matthias@kaehlcke.net>
Date: Tue, 22 Dec 2009 23:05:45 +0100
Subject: [PATCH] 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>
---
include/compiler.h | 3 +++
include/linux/mtd/compat.h | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/compiler.h b/include/compiler.h
index e602cce2e9..332618e9de 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 f0c8464db5..39c693f7a8 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
--
GitLab