diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-22 10:22:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-22 10:22:52 -0700 |
| commit | 7c14e4d6fbdd68bf8026868e8de263017c81b83d (patch) | |
| tree | ae0fce08df2ecdb7f0260b893f7e4bee836390e1 /arch | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| parent | Revert "x86/hyperv: fix logical processor creation" (diff) | |
| download | linux-dev-7c14e4d6fbdd68bf8026868e8de263017c81b83d.tar.xz linux-dev-7c14e4d6fbdd68bf8026868e8de263017c81b83d.zip | |
Merge tag 'hyperv-fixes-signed-20210722' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
Pull hyperv fixes from Wei Liu:
- bug fix from Haiyang for vmbus CPU assignment
- revert of a bogus patch that went into 5.14-rc1
* tag 'hyperv-fixes-signed-20210722' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
Revert "x86/hyperv: fix logical processor creation"
Drivers: hv: vmbus: Fix duplicate CPU assignments within a device
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/mshyperv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index cc8f1773deca..c890d67a64ad 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -237,7 +237,7 @@ static void __init hv_smp_prepare_cpus(unsigned int max_cpus) for_each_present_cpu(i) { if (i == 0) continue; - ret = hv_call_add_logical_proc(numa_cpu_node(i), i, i); + ret = hv_call_add_logical_proc(numa_cpu_node(i), i, cpu_physical_id(i)); BUG_ON(ret); } |