diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2017-01-13 11:46:39 +0100 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-05-15 02:48:43 -0700 |
| commit | 83d250bfbe37835a41531d627d3753bce7c9c742 (patch) | |
| tree | c47f728f5207bdb223e2c87212c7734b072d064c | |
| parent | e90d139d12a55dbe5212a32859937ce5b2ba8e37 (diff) | |
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.
Change-Id: I1168811eec6879e6ca0a2c45f70577d6406615d1
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Git-Commit: ed79c9d34f4f4c5842b66cab840315e7ac29f666
Git-Repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[bharad@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Naitik Bharadiya <bharad@codeaurora.org>
| -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 */ |