Browse Source

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>
Matthias Kaehlcke 14 years ago
parent
commit
b63815e313
2 changed files with 3 additions and 3 deletions
  1. 3 0
      include/compiler.h
  2. 0 3
      include/linux/mtd/compat.h

+ 3 - 0
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

+ 0 - 3
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