diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-15 20:05:01 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-15 20:05:01 +0300 |
| commit | c24449b321095d8c80cdda3d68107269c1d5569f (patch) | |
| tree | 09ccec7c93a9f2418e92027f20335654f4e7f0fb /include | |
| parent | d567f5db412ed52de0b3b3efca4a451263de6108 (diff) | |
| parent | ffc58bc4af9365d4eea72526bb3cf6a83615c673 (diff) | |
| download | linux-c24449b321095d8c80cdda3d68107269c1d5569f.tar.xz | |
Merge tag 'hyperv-fixes-signed-20220215' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
Pull hyperv fixes from Wei Liu:
- Rework use of DMA_BIT_MASK in vmbus to work around a clang bug
(Michael Kelley)
- Fix NUMA topology (Long Li)
- Fix a memory leak in vmbus (Miaoqian Lin)
- One minor clean-up patch (Cai Huoqing)
* tag 'hyperv-fixes-signed-20220215' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
Drivers: hv: utils: Make use of the helper macro LIST_HEAD()
Drivers: hv: vmbus: Rework use of DMA_BIT_MASK(64)
Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj
PCI: hv: Fix NUMA node assignment when kernel boots with custom NUMA topology
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hyperv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index f565a8938836..fe2e0179ed51 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1262,6 +1262,7 @@ struct hv_device { struct vmbus_channel *channel; struct kset *channels_kset; struct device_dma_parameters dma_parms; + u64 dma_mask; /* place holder to keep track of the dir for hv device in debugfs */ struct dentry *debug_dir; |