| commit | a752efca7d3f8857d08ffe46407c4ee36fe4b890 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Aug 13 16:27:36 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 13 16:27:36 2012 -0700 |
| tree | 60df9287bb6a35c668458004b702a5108316cf02 | |
| parent | cd6a555d53893369c7cba7486a013eb5394f5677 [diff] | |
| parent | 20667305c6dd45a98de8a54cb47a537c8a40a35e [diff] |
am 20667305: Merge "[MIPS] Fix the path for unistd.h" * commit '20667305c6dd45a98de8a54cb47a537c8a40a35e': [MIPS] Fix the path for unistd.h
diff --git a/perf.h b/perf.h index 4f770be..712bbc7 100644 --- a/perf.h +++ b/perf.h
@@ -86,7 +86,13 @@ #endif #ifdef __mips__ +/* ANDROID_CHANGE_BEGIN */ +#if 0 #include "../../arch/mips/include/asm/unistd.h" +#elif !defined(__APPLE__) +#include <asm/unistd.h> +#endif +/* ANDROID_CHANGE_END */ #define rmb() asm volatile( \ ".set mips2\n\t" \ "sync\n\t" \