commit | 3043b1884e42ad9cfc7791b09d3cffc5f1ac13aa | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 29 06:34:23 2012 -0700 |
committer | android code review <noreply-gerritcodereview@google.com> | Wed Aug 29 06:34:24 2012 -0700 |
tree | a86a051adb6f10bfeca4811cabe8bb16ed63baab | |
parent | b72d0474ab2a0d78b2fb61973920aba9d777094c [diff] | |
parent | a175903ff79ff0ed834c4968c4bcc5af86da4d45 [diff] |
Merge "Fix build for x86_64"
diff --git a/perf.h b/perf.h index 712bbc7..1a0a8de 100644 --- a/perf.h +++ b/perf.h
@@ -18,7 +18,13 @@ #endif #if defined(__x86_64__) +/* ANDROID_CHANGE_BEGIN */ +#if 0 #include "../../arch/x86/include/asm/unistd.h" +#elif !defined(__APPLE__) +#include <asm/unistd.h> +#endif +/* ANDROID_CHANGE_END */ #define rmb() asm volatile("lfence" ::: "memory") #define cpu_relax() asm volatile("rep; nop" ::: "memory"); #endif