commit 48630d72aea6bab5223eb2538c34d87c1500d7f6
author Jean-Baptiste Queru <jbq@google.com> Wed Aug 29 07:41:07 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 29 07:41:07 2012 -0700
tree a11f05ddd0544e622d118b45706763a537df8acb
parent 3faf4c4879c9ec35d464774444b75a2e6b4224a6
parent 3043b1884e42ad9cfc7791b09d3cffc5f1ac13aa

am 3043b188: Merge "Fix build for x86_64"

* commit '3043b1884e42ad9cfc7791b09d3cffc5f1ac13aa':
  Fix build for x86_64

perf.h

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