git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Linux 3.2.102
[pandora-kernel.git]
/
net
/
sunrpc
/
socklib.c
diff --git
a/net/sunrpc/socklib.c
b/net/sunrpc/socklib.c
index
10b4319
..
0a648c5
100644
(file)
--- a/
net/sunrpc/socklib.c
+++ b/
net/sunrpc/socklib.c
@@
-14,6
+14,7
@@
#include <linux/pagemap.h>
#include <linux/udp.h>
#include <linux/sunrpc/xdr.h>
#include <linux/pagemap.h>
#include <linux/udp.h>
#include <linux/sunrpc/xdr.h>
+#include <linux/export.h>
/**
/**
@@
-113,7
+114,7
@@
ssize_t xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base, struct
}
len = PAGE_CACHE_SIZE;
}
len = PAGE_CACHE_SIZE;
- kaddr = kmap_atomic(*ppage
, KM_SKB_SUNRPC_DATA
);
+ kaddr = kmap_atomic(*ppage);
if (base) {
len -= base;
if (pglen < len)
if (base) {
len -= base;
if (pglen < len)
@@
-126,7
+127,7
@@
ssize_t xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base, struct
ret = copy_actor(desc, kaddr, len);
}
flush_dcache_page(*ppage);
ret = copy_actor(desc, kaddr, len);
}
flush_dcache_page(*ppage);
- kunmap_atomic(kaddr
, KM_SKB_SUNRPC_DATA
);
+ kunmap_atomic(kaddr);
copied += ret;
if (ret != len || !desc->count)
goto out;
copied += ret;
if (ret != len || !desc->count)
goto out;