| From 99789f24bb9be179efcee5615288779fe2345d53 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 23 Jan 2011 14:18:48 -0500 |
| Subject: [PATCH] kvm: use raw_smp_processor_id in make_all_cpus_request |
| |
| 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 \ |
| virt/kvm/kvm_main.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/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c |
| index 548f925..e9dc6c5 100644 |
| --- a/virt/kvm/kvm_main.c |
| +++ b/virt/kvm/kvm_main.c |
| @@ -139,7 +139,7 @@ static bool make_all_cpus_request(struct kvm *kvm, unsigned int req) |
| zalloc_cpumask_var(&cpus, GFP_ATOMIC); |
| |
| raw_spin_lock(&kvm->requests_lock); |
| - me = smp_processor_id(); |
| + me = raw_smp_processor_id(); |
| kvm_for_each_vcpu(i, vcpu, kvm) { |
| if (test_and_set_bit(req, &vcpu->requests)) |
| continue; |
| -- |
| 1.7.1.1 |
| |