diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-10-26 11:33:10 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-10-26 11:33:10 -0400 |
| commit | 3e27d9cd254ade3bd73e996e9f1a71675ea5b487 (patch) | |
| tree | 5fef557e20ee3e3526029dae0568dc7858268f3b | |
| parent | 147d1d75a2684623ce2f3927eb94bc1683e15ef9 (diff) | |
| parent | 9fc71703e9baa5b5174a72c053ae1ca736df2d42 (diff) | |
Merge tag 'v3.0.48' into v3.0-rt
This is the 3.0.48 stable release
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | block/blk-core.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 47 +SUBLEVEL = 48 EXTRAVERSION = NAME = Sneaky Weasel diff --git a/block/blk-core.c b/block/blk-core.c index abc5b6b35c8a..4e662ed047d7 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -528,7 +528,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn, q->request_fn = rfn; q->prep_rq_fn = NULL; q->unprep_rq_fn = NULL; - q->queue_flags |= QUEUE_FLAG_DEFAULT; + q->queue_flags = QUEUE_FLAG_DEFAULT; /* Override internal queue lock with supplied lock pointer */ if (lock) |