From: Thomas Leonard <talex5@gmail.com>
Date: Thu, 26 Jun 2014 11:28:31 +0000 (+0100)
Subject: mini-os: moved unlikely/likely macros to new compiler.h
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e9acda347047a8482d913e9aa289ad11de0c2cae;p=people%2Fliuw%2Flibxenctrl-split%2Fmini-os.git

mini-os: moved unlikely/likely macros to new compiler.h

Requested by Julien Grall.

Signed-off-by: Thomas Leonard <talex5@gmail.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---

diff --git a/include/compiler.h b/include/compiler.h
new file mode 100644
index 0000000..e35c9d5
--- /dev/null
+++ b/include/compiler.h
@@ -0,0 +1,5 @@
+#if __GNUC__ == 2 && __GNUC_MINOR__ < 96
+#define __builtin_expect(x, expected_value) (x)
+#endif
+#define unlikely(x)  __builtin_expect((x),0)
+#define likely(x)  __builtin_expect((x),1)
diff --git a/include/x86/os.h b/include/x86/os.h
index 73b8297..192b23c 100644
--- a/include/x86/os.h
+++ b/include/x86/os.h
@@ -7,16 +7,11 @@
 #ifndef _OS_H_
 #define _OS_H_
 
-#if __GNUC__ == 2 && __GNUC_MINOR__ < 96
-#define __builtin_expect(x, expected_value) (x)
-#endif
-#define unlikely(x)  __builtin_expect((x),0)
-#define likely(x)  __builtin_expect((x),1)
-
 #define smp_processor_id() 0
 
 
 #ifndef __ASSEMBLY__
+#include <mini-os/compiler.h>
 #include <mini-os/types.h>
 #include <mini-os/hypervisor.h>
 #include <mini-os/kernel.h>