Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cec80d82 authored Oct 01, 2015 by Ben Hutchings Committed by Matt Turner Aug 29, 2017

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 <ben@decadent.org.uk>
Tested-by: Michael Cree <mcree@orcon.net.nz>
Cc: stable@vger.kernel.org
Signed-off-by: Matt Turner <mattst88@gmail.com>

parent 7817cedc

arch/alpha/include/asm/types.h

+1 −1

Original line number	Diff line number	Diff line
		#ifndef _ALPHA_TYPES_H
		#define _ALPHA_TYPES_H

		#include <asm-generic/int-ll64.h>
		#include <uapi/asm/types.h>

		#endif /* _ALPHA_TYPES_H */

arch/alpha/include/uapi/asm/types.h

+11 −1

Original line number	Diff line number	Diff line
		@@ -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 */