3.2.95-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Ben Hutchings <[email protected]> commit cec80d82142ab25c71eee24b529cfeaf17c43062 upstream. 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 <[email protected]> Tested-by: Michael Cree <[email protected]> Signed-off-by: Matt Turner <[email protected]> --- --- a/arch/alpha/include/asm/types.h +++ b/arch/alpha/include/asm/types.h @@ -9,10 +9,18 @@ * need to be careful to avoid a name clashes. */ -#ifdef __KERNEL__ -#include <asm-generic/int-ll64.h> -#else +/* + * 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 #ifndef __ASSEMBLY__
