diff --git a/[refs] b/[refs]
index b50eb9e0f1cd..6389e391a6ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 890139529d45ebd3c60d541f4eddc60e042fdf98
+refs/heads/master: 1c1e436269fe840cdbecfaf397b21778dd276f26
diff --git a/trunk/arch/arm64/include/asm/hwcap.h b/trunk/arch/arm64/include/asm/hwcap.h
index f8190ba45a3e..db05f9766112 100644
--- a/trunk/arch/arm64/include/asm/hwcap.h
+++ b/trunk/arch/arm64/include/asm/hwcap.h
@@ -35,7 +35,8 @@
 #define COMPAT_HWCAP_IDIVT	(1 << 18)
 #define COMPAT_HWCAP_IDIV	(COMPAT_HWCAP_IDIVA|COMPAT_HWCAP_IDIVT)
 
-#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+#ifdef __KERNEL__
+#ifndef __ASSEMBLY__
 /*
  * This yields a mask that user programs can use to figure out what
  * instruction set this cpu supports.
@@ -49,5 +50,6 @@
 
 extern unsigned int elf_hwcap;
 #endif
+#endif
 
 #endif
diff --git a/trunk/arch/arm64/include/asm/stat.h b/trunk/arch/arm64/include/asm/stat.h
index d87225cbead8..a9f580c28f7b 100644
--- a/trunk/arch/arm64/include/asm/stat.h
+++ b/trunk/arch/arm64/include/asm/stat.h
@@ -18,7 +18,8 @@
 
 #include <asm-generic/stat.h>
 
-#if defined(__KERNEL__) && defined(CONFIG_COMPAT)
+#ifdef __KERNEL__
+#ifdef CONFIG_COMPAT
 
 #include <asm/compat.h>
 
@@ -57,6 +58,7 @@ struct stat64 {
 	compat_u64	st_ino;
 };
 
+#endif
 #endif
 
 #endif
diff --git a/trunk/arch/arm64/include/asm/unistd.h b/trunk/arch/arm64/include/asm/unistd.h
index f55ba3e56c32..8f03dee066ed 100644
--- a/trunk/arch/arm64/include/asm/unistd.h
+++ b/trunk/arch/arm64/include/asm/unistd.h
@@ -18,6 +18,8 @@
 #include <asm-generic/unistd.h>
 #endif
 
-#if defined(__KERNEL__) && defined(CONFIG_COMPAT)
+#ifdef __KERNEL__
+#ifdef CONFIG_COMPAT
 #include <asm/unistd32.h>
 #endif
+#endif