Commit f3e9dc45 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman

alpha: uapi: Add support for __SANE_USERSPACE_TYPES__

commit cec80d82 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: default avatarBen Hutchings <ben@decadent.org.uk>
Tested-by: default avatarMichael Cree <mcree@orcon.net.nz>
Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae53897e
#ifndef _ALPHA_TYPES_H #ifndef _ALPHA_TYPES_H
#define _ALPHA_TYPES_H #define _ALPHA_TYPES_H
#include <asm-generic/int-ll64.h> #include <uapi/asm/types.h>
#endif /* _ALPHA_TYPES_H */ #endif /* _ALPHA_TYPES_H */
...@@ -9,8 +9,18 @@ ...@@ -9,8 +9,18 @@
* need to be careful to avoid a name clashes. * 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> #include <asm-generic/int-l64.h>
#else
#include <asm-generic/int-ll64.h>
#endif #endif
#endif /* _UAPI_ALPHA_TYPES_H */ #endif /* _UAPI_ALPHA_TYPES_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment