7 files changed, 12 insertions, 3 deletions

diff --git a/arch/ia64/lib/csum_partial_copy.c b/arch/ia64/lib/csum_partial_copy.c
index 503dfe6d145..118daf5a063 100644
--- a/arch/ia64/lib/csum_partial_copy.c
+++ b/arch/ia64/lib/csum_partial_copy.c
@@ -128,6 +128,8 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
         return (__force __wsum)result;
 }
 
+EXPORT_SYMBOL(csum_partial_copy_from_user);
+
 __wsum
 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 {
diff --git a/fs/Kconfig b/fs/Kconfig
index e33c0892457..a42f767dcdd 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -2020,6 +2020,7 @@ config AFS_FS
         tristate "Andrew File System support (AFS) (EXPERIMENTAL)"
         depends on INET && EXPERIMENTAL
         select AF_RXRPC
+        select KEYS
         help
           If you say Y here, you will get an experimental Andrew File System
           driver. It currently only supports unsecured read-only AFS access.
diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 6dd3197d1d8..34665f7d7a1 100644
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -367,7 +367,7 @@ struct afs_uuid {
         u32             time_low;                       /* low part of timestamp */
         u16             time_mid;                       /* mid part of timestamp */
         u16             time_hi_and_version;            /* high part of timestamp and version  */
-#define AFS_UUID_TO_UNIX_TIME   0x01b21dd213814000
+#define AFS_UUID_TO_UNIX_TIME   0x01b21dd213814000ULL
 #define AFS_UUID_TIMEHI_MASK    0x0fff
 #define AFS_UUID_VERSION_TIME   0x1000  /* time-based UUID */
 #define AFS_UUID_VERSION_NAME   0x3000  /* name-based UUID */
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index e7b047328a3..222c1a3abbb 100644
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -772,7 +772,7 @@ int afs_extract_data(struct afs_call *call, struct sk_buff *skb,
 
         if (call->offset < count) {
                 if (last) {
-                        _leave(" = -EBADMSG [%d < %lu]", call->offset, count);
+                        _leave(" = -EBADMSG [%d < %zu]", call->offset, count);
                         return -EBADMSG;
                 }
                 _leave(" = -EAGAIN");
diff --git a/fs/afs/use-rtnetlink.c b/fs/afs/use-rtnetlink.c
index 82f0daa2897..f8991c700e0 100644
--- a/fs/afs/use-rtnetlink.c
+++ b/fs/afs/use-rtnetlink.c
@@ -243,7 +243,7 @@ static int afs_read_rtm(struct afs_rtm_desc *desc)
                 desc->datalen = kernel_recvmsg(desc->nlsock, &msg, iov, 1,
                                                desc->datamax, 0);
                 if (desc->datalen < 0) {
-                        _leave(" = %ld [recv]", desc->datalen);
+                        _leave(" = %zd [recv]", desc->datalen);
                         return desc->datalen;
                 }
 
diff --git a/net/rxrpc/Kconfig b/net/rxrpc/Kconfig
index d72380e304a..8750f6da6bc 100644
--- a/net/rxrpc/Kconfig
+++ b/net/rxrpc/Kconfig
@@ -30,6 +30,11 @@ config AF_RXRPC_DEBUG
 config RXKAD
         tristate "RxRPC Kerberos security"
         depends on AF_RXRPC && KEYS
+        select CRYPTO
+        select CRYPTO_MANAGER
+        select CRYPTO_BLKCIPHER
+        select CRYPTO_PCBC
+        select CRYPTO_FCRYPT
         help
           Provide kerberos 4 and AFS kaserver security handling for AF_RXRPC
           through the use of the key retention service.
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index 1eaf529efac..5ec705144e1 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -18,6 +18,7 @@
 #include <linux/ctype.h>
 #include <net/sock.h>
 #include <net/af_rxrpc.h>
+#define rxrpc_debug rxkad_debug
 #include "ar-internal.h"
 
 #define RXKAD_VERSION                   2