aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-05-26 22:30:56 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2022-05-26 22:30:56 -0400
commit86c954ae7a69830af8a589ea83d24ede2d657c90 (patch)
tree1540356989a5a97775acad19003989c899bc6327
parent400025367e3c01d4141018ded6289cb64737e570 (diff)
parent5509050b339240ebde03dfce0aa3ed9a7b41ddbe (diff)
downloadlinux-yocto-v5.10/standard/preempt-rt/x86.tar.gz
linux-yocto-v5.10/standard/preempt-rt/x86.tar.bz2
linux-yocto-v5.10/standard/preempt-rt/x86.zip
Merge branch 'v5.10/standard/base' into v5.10/standard/preempt-rt/x86v5.10/standard/preempt-rt/x86
-rw-r--r--drivers/virtio/virtio_pci_common.c3
-rw-r--r--fs/xfs/Makefile1
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index b35bb2d57f62..1e890ef17687 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -254,8 +254,7 @@ void vp_del_vqs(struct virtio_device *vdev)
if (vp_dev->msix_affinity_masks) {
for (i = 0; i < vp_dev->msix_vectors; i++)
- if (vp_dev->msix_affinity_masks[i])
- free_cpumask_var(vp_dev->msix_affinity_masks[i]);
+ free_cpumask_var(vp_dev->msix_affinity_masks[i]);
}
if (vp_dev->msix_enabled) {
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index 04611a1068b4..8d4ad8ed4b77 100644
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -6,6 +6,7 @@
ccflags-y += -I $(srctree)/$(src) # needed for trace events
ccflags-y += -I $(srctree)/$(src)/libxfs
+ccflags-y += -Wno-error=dangling-pointer
obj-$(CONFIG_XFS_FS) += xfs.o