summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-06-14 17:05:09 +0200
committerClark Williams <williams@redhat.com>2012-03-24 09:29:23 -0500
commite0889690ff9154e0bd5f08a771114a6dbac7cfe2 (patch)
treee67bbc4d05095fdb00c55127d54270d126f014ad
parenteb08f5f83b44acae8bba298970a62bcfabdf193f (diff)
fs-block-rt-support.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--block/blk-core.c2
-rw-r--r--fs/file.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 7366ad422a5a..ca732c065018 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -235,7 +235,7 @@ EXPORT_SYMBOL(blk_delay_queue);
**/
void blk_start_queue(struct request_queue *q)
{
- WARN_ON(!irqs_disabled());
+ WARN_ON_NONRT(!irqs_disabled());
queue_flag_clear(QUEUE_FLAG_STOPPED, q);
__blk_run_queue(q);
diff --git a/fs/file.c b/fs/file.c
index 375472d36629..fd0325842717 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -105,14 +105,14 @@ void free_fdtable_rcu(struct rcu_head *rcu)
kfree(fdt->open_fds);
kfree(fdt);
} else {
- fddef = &get_cpu_var(fdtable_defer_list);
+ fddef = &per_cpu(fdtable_defer_list, get_cpu_light());
spin_lock(&fddef->lock);
fdt->next = fddef->next;
fddef->next = fdt;
/* vmallocs are handled from the workqueue context */
schedule_work(&fddef->wq);
spin_unlock(&fddef->lock);
- put_cpu_var(fdtable_defer_list);
+ put_cpu_light();
}
}