OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.5/nvme' of git://git.kernel.dk/linux-block
[uclinux-h8/linux.git]
/
include
/
linux
/
blkdev.h
diff --git
a/include/linux/blkdev.h
b/include/linux/blkdev.h
index
d372ea8
..
29189ae
100644
(file)
--- a/
include/linux/blkdev.h
+++ b/
include/linux/blkdev.h
@@
-409,6
+409,7
@@
struct request_queue {
unsigned int rq_timeout;
struct timer_list timeout;
+ struct work_struct timeout_work;
struct list_head timeout_list;
struct list_head icq_list;