diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-29 07:41:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-29 07:41:07 -0700 |
| commit | 48630d72aea6bab5223eb2538c34d87c1500d7f6 (patch) | |
| tree | a11f05ddd0544e622d118b45706763a537df8acb | |
| parent | 3faf4c4879c9ec35d464774444b75a2e6b4224a6 (diff) | |
| parent | 3043b1884e42ad9cfc7791b09d3cffc5f1ac13aa (diff) | |
am 3043b188: Merge "Fix build for x86_64"android-4.2_r1
* commit '3043b1884e42ad9cfc7791b09d3cffc5f1ac13aa':
Fix build for x86_64
| -rw-r--r-- | perf.h | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -18,7 +18,13 @@ void get_term_dimensions(struct winsize *ws); #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 |