From: Ben Hutchings Date: Tue, 29 Sep 2015 01:55:06 +0000 (+0100) Subject: alpha: uapi: Add support for __SANE_USERSPACE_TYPES__ X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~11^2~12 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6592f11d6836712c1c4d26a390c19e678f2e27e8;p=linux-4.9.git alpha: uapi: Add support for __SANE_USERSPACE_TYPES__ This fixes compiler errors in perf such as: tests/attr.c: In function 'store_event': tests/attr.c:66:27: error: format '%llu' expects argument of type 'long long unsigned int', but argument 6 has type '__u64 {aka long unsigned int}' [-Werror=format=] snprintf(path, PATH_MAX, "%s/event-%d-%llu-%d", dir, ^ Signed-off-by: Ben Hutchings Tested-by: Michael Cree Cc: stable@vger.kernel.org Gbp-Pq: Topic bugfix/alpha Gbp-Pq: Name alpha-uapi-add-support-for-__sane_userspace_types__.patch --- 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 +#else +#include #endif #endif /* _UAPI_ALPHA_TYPES_H */