diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-29 15:04:51 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-29 15:04:51 -0500 |
| commit | 269e46120b88dd12c382d096c9aa171208cb2e61 (patch) | |
| tree | ee87e6885db87e8f101eb7eef4349007d9ed19bc | |
| parent | 81ffc78d3845274329aff87ca0d5dd0902351a62 (diff) | |
| download | 4.12-rt-patches-269e46120b88dd12c382d096c9aa171208cb2e61.tar.gz | |
block: refresh warning mask patch due to stable backport of 4ddd56b003f
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | patches/fs-block-rt-support.patch | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/patches/fs-block-rt-support.patch b/patches/fs-block-rt-support.patch index d52294701d1827..f64b3935159912 100644 --- a/patches/fs-block-rt-support.patch +++ b/patches/fs-block-rt-support.patch @@ -1,22 +1,25 @@ -Subject: block: Turn off warning which is bogus on RT +From 564200fc02692e8470ab886e807b8219be32a66e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 14 Jun 2011 17:05:09 +0200 +Subject: [PATCH] block: Turn off warning which is bogus on RT On -RT the context is always with IRQs enabled. Ignore this warning on -RT. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> ---- - block/blk-core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/block/blk-core.c b/block/blk-core.c +index ce997e9f0747..a2b67aba2b6c 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -214,7 +214,7 @@ EXPORT_SYMBOL(blk_start_queue_async); **/ void blk_start_queue(struct request_queue *q) { -- WARN_ON(!irqs_disabled()); -+ WARN_ON_NONRT(!irqs_disabled()); +- WARN_ON(!in_interrupt() && !irqs_disabled()); ++ WARN_ON_NONRT(!in_interrupt() && !irqs_disabled()); queue_flag_clear(QUEUE_FLAG_STOPPED, q); __blk_run_queue(q); +-- +2.15.0 + |