diff options
| -rw-r--r-- | include/compiler.h | 3 | ||||
| -rw-r--r-- | include/linux/mtd/compat.h | 3 | 
2 files changed, 3 insertions, 3 deletions
| diff --git a/include/compiler.h b/include/compiler.h index e602cce2e..332618e9d 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 f0c8464db..39c693f7a 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 |