2014-01-22 02:40:27

by Mike Frysinger

Subject: [PATCH] uapi: convert u64 to __u64 in exported headers

The u64 type is not defined in any exported kernel headers, so trying
to use it will lead to build failures.

Signed-off-by: Mike Frysinger <[email protected]>
---
include/uapi/linux/nfs4.h | 2 +-
include/uapi/linux/perf_event.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/nfs4.h b/include/uapi/linux/nfs4.h
index 788128e..35f5f4c 100644
--- a/include/uapi/linux/nfs4.h
+++ b/include/uapi/linux/nfs4.h
@@ -150,7 +150,7 @@
#define NFS4_SECINFO_STYLE4_CURRENT_FH 0
#define NFS4_SECINFO_STYLE4_PARENT 1

-#define NFS4_MAX_UINT64 (~(u64)0)
+#define NFS4_MAX_UINT64 (~(__u64)0)

/* An NFS4 sessions server must support at least NFS4_MAX_OPS operations.
* If a compound requires more operations, adjust NFS4_MAX_OPS accordingly.
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 959d454..7a3fed5 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -787,7 +787,7 @@ union perf_mem_data_src {
#define PERF_MEM_TLB_SHIFT 26

#define PERF_MEM_S(a, s) \
- (((u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
+ (((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)

/*
* single taken branch record layout:
--
1.8.4.3

2014-01-22 03:02:14

by David Rientjes

Subject: Re: [PATCH] uapi: convert u64 to __u64 in exported headers

On Tue, 21 Jan 2014, Mike Frysinger wrote:

> The u64 type is not defined in any exported kernel headers, so trying
> to use it will lead to build failures.
>
> Signed-off-by: Mike Frysinger <[email protected]>

Acked-by: David Rientjes <[email protected]>