summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2017-01-13 11:46:39 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2017-01-13 17:02:38 +0000
commited79c9d34f4f4c5842b66cab840315e7ac29f666 (patch)
treed073a53ff78844c9a763c076b21c5348eb4cffec /arch/arm
parentddc37832a1349f474c4532de381498020ed71d31 (diff)
downloadlinux-stable-ed79c9d34f4f4c5842b66cab840315e7ac29f666.tar.gz
linux-stable-ed79c9d34f4f4c5842b66cab840315e7ac29f666.tar.bz2
linux-stable-ed79c9d34f4f4c5842b66cab840315e7ac29f666.zip
ARM: put types.h in uapi
Due to the way kbuild works, this header was unintentionally exported back in 2013 when it was created, despite it not being in a uapi/ directory. This is very non-intuitive behaviour by Kbuild. However, we've had this include exported to userland for almost four years, and searching google for "ARM types.h __UINTPTR_TYPE__" gives no hint that anyone has complained about it. So, let's make it officially exported in this state. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/uapi/asm/types.h (renamed from arch/arm/include/asm/types.h)6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/uapi/asm/types.h
index a53cdb8f068c..9435a42f575e 100644
--- a/arch/arm/include/asm/types.h
+++ b/arch/arm/include/uapi/asm/types.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_TYPES_H
-#define _ASM_TYPES_H
+#ifndef _UAPI_ASM_TYPES_H
+#define _UAPI_ASM_TYPES_H
#include <asm-generic/int-ll64.h>
@@ -37,4 +37,4 @@
#define __UINTPTR_TYPE__ unsigned long
#endif
-#endif /* _ASM_TYPES_H */
+#endif /* _UAPI_ASM_TYPES_H */