diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 22:25:47 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 22:25:47 +0400 |
| commit | 686c09407d24123755ee05aae5be680be886a233 (patch) | |
| tree | c30976567e12b6c6b1ab4dd42be7ace3cc09ac06 /drivers/hv/channel_mgmt.c | |
| parent | bc2e4a90d9f75f1664c1587eb09ecd10bb71b022 (diff) | |
| parent | 302a3c0f2757ae1a3e7df3f9fa1f20e2214ab945 (diff) | |
| download | linux-686c09407d24123755ee05aae5be680be886a233.tar.xz | |
Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc patch from Greg Kroah-Hartman:
"Here is one remaining patch for 3.9-rc1. It is for the hyper-v
drivers, and had to wait until some other patches went in through the
x86 tree."
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
Drivers: hv: vmbus: Use the new infrastructure for delivering VMBUS interrupts
Diffstat (limited to 'drivers/hv/channel_mgmt.c')
| -rw-r--r-- | drivers/hv/channel_mgmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c index 53a8600162a5..ff1be167eb04 100644 --- a/drivers/hv/channel_mgmt.c +++ b/drivers/hv/channel_mgmt.c @@ -318,7 +318,7 @@ static u32 get_vp_index(uuid_le *type_guid) return 0; } cur_cpu = (++next_vp % max_cpus); - return 0; + return cur_cpu; } /* |