diff --git a/[refs] b/[refs] index 9bd8b3f928a3..a1d33668c3d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a78362c4eefc1deddbefe2c7f38aabbc2429d6b +refs/heads/master: 6fc2de06ef1e691d032aa572478c905b7495a274 diff --git a/trunk/include/linux/iocontext.h b/trunk/include/linux/iocontext.h index 78ef023227d4..1195a806fe0c 100644 --- a/trunk/include/linux/iocontext.h +++ b/trunk/include/linux/iocontext.h @@ -49,8 +49,8 @@ struct io_context { /* * For request batching */ - unsigned long last_waited; /* Time last woken after wait for request */ int nr_batch_requests; /* Number of requests left in the batch */ + unsigned long last_waited; /* Time last woken after wait for request */ struct radix_tree_root radix_root; struct hlist_head cic_list;