diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-03-01 10:31:53 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-03-01 10:31:53 -0800 |
commit | 04421fe2671c1790ab6529fad87ce8c73af0e1eb (patch) | |
tree | d2f803b4eef6108648f1beee6bf97a342cd9bc73 /include/uapi/linux/nfs4.h | |
parent | 7fb45edba8b5206e645572a682c946f67375447e (diff) | |
parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) | |
download | linux-stable-04421fe2671c1790ab6529fad87ce8c73af0e1eb.tar.gz linux-stable-04421fe2671c1790ab6529fad87ce8c73af0e1eb.tar.bz2 linux-stable-04421fe2671c1790ab6529fad87ce8c73af0e1eb.zip |
Merge tag 'v3.14-rc4' into next
Merge with Linux 3.14-rc4 to bring devm_request_any_context_irq().
Diffstat (limited to 'include/uapi/linux/nfs4.h')
-rw-r--r-- | include/uapi/linux/nfs4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/nfs4.h b/include/uapi/linux/nfs4.h index 788128ebac45..35f5f4c6c260 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. |