diff --git a/[refs] b/[refs]
index 1eddeed521c8..7b4c85da6472 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f35119d6681300ba6d76da53cb1ebc2eed62e77a
+refs/heads/master: 5190f0c030f46b3169205f34f6d9ef480fa39ef2
diff --git a/trunk/include/asm-generic/system.h b/trunk/include/asm-generic/system.h
index 4b0b9cbbfae5..215efa74f5a2 100644
--- a/trunk/include/asm-generic/system.h
+++ b/trunk/include/asm-generic/system.h
@@ -14,7 +14,6 @@
 #ifndef __ASM_GENERIC_SYSTEM_H
 #define __ASM_GENERIC_SYSTEM_H
 
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 #include <linux/types.h>
@@ -139,5 +138,4 @@ unsigned long __xchg(unsigned long x, volatile void *ptr, int size)
 
 #endif /* !__ASSEMBLY__ */
 
-#endif /* __KERNEL__ */
 #endif /* __ASM_GENERIC_SYSTEM_H */