--- zzzz-none-000/linux-2.6.19.2/include/linux/compiler.h	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/include/linux/compiler.h	2007-12-03 15:49:26.000000000 +0000
@@ -53,14 +53,6 @@
 # include <linux/compiler-intel.h>
 #endif
 
-/*
- * Generic compiler-dependent macros required for kernel
- * build go below this comment. Actual compiler/compiler version
- * specific implementations come from the above header files
- */
-
-#define likely(x)	__builtin_expect(!!(x), 1)
-#define unlikely(x)	__builtin_expect(!!(x), 0)
 
 /* Optimization barrier */
 #ifndef barrier
@@ -76,6 +68,16 @@
 
 #endif /* __KERNEL__ */
 
+/*
+ * Generic compiler-dependent macros required for kernel
+ * build go below this comment. Actual compiler/compiler version
+ * specific implementations come from the above header files
+ */
+
+#define likely(x)	__builtin_expect(!!(x), 1)
+#define unlikely(x)	__builtin_expect(!!(x), 0)
+
+
 #endif /* __ASSEMBLY__ */
 
 #ifdef __KERNEL__