diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-09-08 12:02:15 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-09-08 12:02:15 +0800 |
commit | 3e6346662641b8248d3c6cc97169420a10fe2138 (patch) | |
tree | 69b4bc11c34e75ff7957288107d3746d950c45c3 /arch/alpha | |
parent | 1fd0e417c458234339415a3dbbe9a910a215fd86 (diff) | |
parent | f397aef40aba7dd9af66611d6d9b47e4d3c28c2f (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'arch/alpha')
-rw-r--r-- | arch/alpha/include/asm/types.h | 2 | ||||
-rw-r--r-- | arch/alpha/include/uapi/asm/types.h | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/arch/alpha/include/asm/types.h b/arch/alpha/include/asm/types.h index 4cb4b6d3452c..0bc66e1d3a7e 100644 --- a/arch/alpha/include/asm/types.h +++ b/arch/alpha/include/asm/types.h @@ -1,6 +1,6 @@ #ifndef _ALPHA_TYPES_H #define _ALPHA_TYPES_H -#include <asm-generic/int-ll64.h> +#include <uapi/asm/types.h> #endif /* _ALPHA_TYPES_H */ diff --git a/arch/alpha/include/uapi/asm/types.h b/arch/alpha/include/uapi/asm/types.h index 9fd3cd459777..8d1024d7be05 100644 --- a/arch/alpha/include/uapi/asm/types.h +++ b/arch/alpha/include/uapi/asm/types.h @@ -9,8 +9,18 @@ * need to be careful to avoid a name clashes. */ -#ifndef __KERNEL__ +/* + * This is here because we used to use l64 for alpha + * and we don't want to impact user mode with our change to ll64 + * in the kernel. + * + * However, some user programs are fine with this. They can + * flag __SANE_USERSPACE_TYPES__ to get int-ll64.h here. + */ +#if !defined(__SANE_USERSPACE_TYPES__) && !defined(__KERNEL__) #include <asm-generic/int-l64.h> +#else +#include <asm-generic/int-ll64.h> #endif #endif /* _UAPI_ALPHA_TYPES_H */ |