diff options
| author | Aaro Koskinen <aaro.koskinen@nsn.com> | 2014-05-06 12:05:43 -0700 |
|---|---|---|
| committer | Duane Sand <duane.sand@imgtec.com> | 2014-06-20 10:26:45 -0700 |
| commit | 590c087b8984444439be012326c60b9d645eabda (patch) | |
| tree | dcc7b5ce8de213bc224833dc4c326f0b18e9e98f /original | |
| parent | 0e02fd03fed0883583d566425777830b12e22bc4 (diff) | |
| download | kernel-headers-590c087b8984444439be012326c60b9d645eabda.tar.gz | |
[MIPS64] Add __SANE_USERSPACE_TYPES__ to asm/types.h for LL64
Allow 64-bit userspace programs to use ll64 types. The define name
comes from commit 2c9c6ce0199a4d252e20c531cfdc9d24e39235c0 (powerpc:
Add __SANE_USERSPACE_TYPES__ to asm/types.h for LL64).
The patch allows to compile perf on MIPS64 and eliminates the following
warnings:
tests/attr.c:74:4: error: format '%llu' expects argument of type 'long
long unsigned int', but argument 6 has type '__u64' [-Werror=format=]
This patch and the above description is from
http://patchwork.linux-mips.org/patch/6890/
which has been accepted upstream but not yet merged into a release.
This patch is required in order to do full builds of mips64 Android.
Without this patch, various external/* projects fail to compile.
Change-Id: I3b86a4cdb037b0322f99245c28d9a2fda60d595d
Diffstat (limited to 'original')
| -rw-r--r-- | original/uapi/asm-mips/asm/types.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/original/uapi/asm-mips/asm/types.h b/original/uapi/asm-mips/asm/types.h index 7ac9d0b..f3dd9ff 100644 --- a/original/uapi/asm-mips/asm/types.h +++ b/original/uapi/asm-mips/asm/types.h @@ -14,9 +14,12 @@ /* * We don't use int-l64.h for the kernel anymore but still use it for * userspace to avoid code changes. + * + * However, some user programs (e.g. perf) may not want this. They can + * flag __SANE_USERSPACE_TYPES__ to get int-ll64.h here. */ #ifndef __KERNEL__ -# if _MIPS_SZLONG == 64 +# if _MIPS_SZLONG == 64 && !defined(__SANE_USERSPACE_TYPES__) # include <asm-generic/int-l64.h> # else # include <asm-generic/int-ll64.h> |