diff --git a/[refs] b/[refs] index 118606ced985..38d222b6a476 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1badcfbd7febd33f71fc02bda9112bd25e9c294b +refs/heads/master: 37867ae7c549c58d44337e27738577ed8b7cd753 diff --git a/trunk/block/blk-iopoll.c b/trunk/block/blk-iopoll.c index df6f192c9f67..0671d4614b08 100644 --- a/trunk/block/blk-iopoll.c +++ b/trunk/block/blk-iopoll.c @@ -17,6 +17,8 @@ int blk_iopoll_enabled = 1; EXPORT_SYMBOL(blk_iopoll_enabled); +static unsigned int blk_iopoll_budget __read_mostly = 256; + static DEFINE_PER_CPU(struct list_head, blk_cpu_iopoll); /** @@ -78,8 +80,8 @@ EXPORT_SYMBOL(blk_iopoll_complete); static void blk_iopoll_softirq(struct softirq_action *h) { struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); + int rearm = 0, budget = blk_iopoll_budget; unsigned long start_time = jiffies; - int rearm = 0, budget = 64; local_irq_disable();