From 3510637c85a93b3e535482822e7b57693a22d6ac Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 22 Jan 2014 19:04:28 -0800
Subject: [PATCH 1/2] libcutils: fix atomic_memory_store_barrier

dmb isht is not a valid instruction, fix it to be dmb ishst
(data memory barrier, inner shareable, on writes).

Change-Id: I98723ccd8618b7863cb55da53dc29b979c9905a5
---
 include/cutils/atomic-aarch64.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/cutils/atomic-aarch64.h b/include/cutils/atomic-aarch64.h
index 927379f64..4562ad0f8 100644
--- a/include/cutils/atomic-aarch64.h
+++ b/include/cutils/atomic-aarch64.h
@@ -66,7 +66,7 @@ void android_memory_barrier(void)
 extern ANDROID_ATOMIC_INLINE
 void android_memory_store_barrier(void)
 {
-    __asm__ __volatile__ ("dmb isht" : : : "memory");
+    __asm__ __volatile__ ("dmb ishst" : : : "memory");
 }
 #endif
 

From 65dd88beccc571315ffc5d9cce90402d0426a28b Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 22 Jan 2014 19:06:04 -0800
Subject: [PATCH 2/2] system/core: remove $(KERNEL_HEADERS) from includes

The kernel headers are already in the include path, and manually
adding them again will break on a multiarch build, where the
kernel headers may be different for each arch.

Change-Id: Ib13d96543f2c97b1b487a46e1748ceb2c5724169
---
 libcutils/Android.mk   | 2 +-
 libsysutils/Android.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index f8dda3670..c08a50f60 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -124,7 +124,7 @@ else  # !arm
     endif # !x86
 endif # !arm
 
-LOCAL_C_INCLUDES := $(libcutils_c_includes) $(KERNEL_HEADERS)
+LOCAL_C_INCLUDES := $(libcutils_c_includes)
 LOCAL_STATIC_LIBRARIES := liblog
 LOCAL_CFLAGS += $(targetSmpFlag)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/libsysutils/Android.mk b/libsysutils/Android.mk
index 1d396b2ad..1451b0d0b 100644
--- a/libsysutils/Android.mk
+++ b/libsysutils/Android.mk
@@ -16,7 +16,7 @@ LOCAL_SRC_FILES:=                             \
 
 LOCAL_MODULE:= libsysutils
 
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS)
+LOCAL_C_INCLUDES :=
 
 LOCAL_CFLAGS :=