| From bb039626d47b7ce9167e2fe7e3adffa486bd83bc Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sat, 22 Jan 2011 22:23:44 -0500 |
| Subject: [PATCH] blk: use raw_smp_processor_id in blk_cpu_to_group() |
| |
| This is one of several extractions from the merge up to 33-rc8. |
| |
| See it in a git tip repo with: |
| |
| git diff 5f854cfc024622e4aae14d7cf422f6ff86278688^2 \ |
| 5f854cfc024622e4aae14d7cf422f6ff86278688 block/blk-core.c |
| |
| You can find the origin of this change in the tip merge commit: |
| |
| commit 5f854cfc024622e4aae14d7cf422f6ff86278688 |
| Merge: cc24da0 4ec62b2 |
| Author: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun Feb 21 20:17:22 2010 +0100 |
| |
| Forward to 2.6.33-rc8 |
| |
| Merge branch 'linus' into rt/head with a pile of conflicts. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| Normally there are not significant changes/additions in a merge commit that |
| are not from any other "normal" commit. But in this case there are, so |
| break them out into separate explicit commits. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/block/blk-core.c b/block/blk-core.c |
| index f776d0e..94cf03e 100644 |
| --- a/block/blk-core.c |
| +++ b/block/blk-core.c |
| @@ -1267,7 +1267,7 @@ get_rq: |
| spin_lock_irq(q->queue_lock); |
| if (test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags) || |
| bio_flagged(bio, BIO_CPU_AFFINE)) |
| - req->cpu = blk_cpu_to_group(smp_processor_id()); |
| + req->cpu = blk_cpu_to_group(raw_smp_processor_id()); |
| if (queue_should_plug(q) && elv_queue_empty(q)) |
| blk_plug_device(q); |
| add_request(q, req); |
| -- |
| 1.7.1.1 |
| |