Merge tag ‘mips_fixes_5.0_4’ of git:// [Linux 5.0]

Merge tag ‘mips_fixes_5.0_4’ of git:// [Linux 5.0]

This Linux kernel change "Merge tag ‘mips_fixes_5.0_4’ of git://" is included in the Linux 5.0 release. This change is authored by Linus Torvalds <torvalds [at]> on Thu Feb 28 15:33:10 2019 -0800. The commit for this change in Linux stable tree is bf23aba (patch). Other info about this change: Merge: 3eb07d2 e0bf304

Merge tag 'mips_fixes_5.0_4' of git://

Pull MIPS fixes from Paul Burton:
 "A few more MIPS fixes:

   - Fix 16b cmpxchg() operations which could erroneously fail if bits
     15:8 of the old value are non-zero. In practice I'm not aware of
     any actual users of 16b cmpxchg() on MIPS, but this fixes the
     support for it was was introduced in v4.13.

   - Provide a struct device to dma_alloc_coherent for Lantiq XWAY
     systems with a "Voice MIPS Macro Core" (VMMC) device.

   - Provide DMA masks for BCM63xx ethernet devices, fixing a regression
     introduced in v4.19.

   - Fix memblock reservation for the kernel when the system has a
     non-zero PHYS_OFFSET, correcting the memblock conversion performed
     in v4.20"

* tag 'mips_fixes_5.0_4' of git://
  MIPS: fix memory setup for platforms with PHYS_OFFSET != 0
  MIPS: BCM63XX: provide DMA masks for ethernet devices
  MIPS: lantiq: pass struct device to DMA API functions
  MIPS: fix truncation in __cmpxchg_small for short values

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 virt/kvm/kvm_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 5858452..076bc38 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -4044,7 +4044,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm)
    add_uevent_var(env, "PID=%d", kvm->userspace_pid);

-   if (kvm->debugfs_dentry) {
+   if (!IS_ERR_OR_NULL(kvm->debugfs_dentry)) {
        char *tmp, *p = kmalloc(PATH_MAX, GFP_KERNEL);

        if (p) {

Leave a Reply

Your email address will not be published. Required fields are marked *