Subject: [merged] uapi-convert-u64-to-__u64-in-exported-headers.patch removed from -mm tree
To: vapier@xxxxxxxxxx,rientjes@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 24 Jan 2014 11:00:45 -0800
The patch titled
Subject: uapi: convert u64 to __u64 in exported headers
has been removed from the -mm tree. Its filename was
uapi-convert-u64-to-__u64-in-exported-headers.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Frysinger <vapier@xxxxxxxxxx>
Subject: 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 <vapier@xxxxxxxxxx>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/uapi/linux/nfs4.h | 2 +-
include/uapi/linux/perf_event.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN include/uapi/linux/nfs4.h~uapi-convert-u64-to-__u64-in-exported-headers include/uapi/linux/nfs4.h
--- a/include/uapi/linux/nfs4.h~uapi-convert-u64-to-__u64-in-exported-headers
+++ a/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 -puN include/uapi/linux/perf_event.h~uapi-convert-u64-to-__u64-in-exported-headers include/uapi/linux/perf_event.h
--- a/include/uapi/linux/perf_event.h~uapi-convert-u64-to-__u64-in-exported-headers
+++ a/include/uapi/linux/perf_event.h
@@ -788,7 +788,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:
_
Patches currently in -mm which might be from vapier@xxxxxxxxxx are
origin.patch
kmod-run-usermodehelpers-only-on-cpus-allowed-for-kthreadd-v2.patch
kmod-run-usermodehelpers-only-on-cpus-allowed-for-kthreadd-v2-fix.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
