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
Merge tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
block
/
xen-blkback
/
common.h
diff --git
a/drivers/block/xen-blkback/common.h
b/drivers/block/xen-blkback/common.h
index
8ccc49d
..
45a044a
100644
(file)
--- a/
drivers/block/xen-blkback/common.h
+++ b/
drivers/block/xen-blkback/common.h
@@
-345,7
+345,7
@@
struct grant_page {
struct pending_req {
struct xen_blkif *blkif;
u64 id;
- int nr_
page
s;
+ int nr_
seg
s;
atomic_t pendcnt;
unsigned short operation;
int status;