@@ -166,4 +166,7 @@ extern void setup_vm(void);
#define SZ_1G (1 << 30)
#define SZ_2G (1ul << 31)
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#define likely(x) __builtin_expect(!!(x), 1)
+
#endif
@@ -5,10 +5,6 @@
#include "kvmclock.h"
#include "asm/barrier.h"
-#define unlikely(x) __builtin_expect(!!(x), 0)
-#define likely(x) __builtin_expect(!!(x), 1)
-
-
struct pvclock_vcpu_time_info __attribute__((aligned(4))) hv_clock[MAX_CPU];
struct pvclock_wall_clock wall_clock;
static unsigned char valid_flags = 0;