Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aef2ea91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull virtio/lguest fixes from Rusty Russell:
 "Missing license tag and some fallout from the lguest pagetable rework"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  lguest: clear cached last cpu when guest_set_pgd() called.
  Add missing module license tag to vring helpers.
parents f722406f f616fe4f

drivers/lguest/page_tables.c

+1 −0
Original line number Diff line number Diff line
@@ -1002,6 +1002,7 @@ void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 idx) 
			kill_guest(&lg->cpus[0],

				   "Cannot populate switcher mapping");

		}

		lg->pgdirs[pgdir].last_host_cpu = -1;

	}

}

drivers/vhost/vringh.c

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *

 * Since these may be in userspace, we use (inline) accessors.

 */

#include <linux/module.h>

#include <linux/vringh.h>

#include <linux/virtio_ring.h>

#include <linux/kernel.h>
@@ -1005,3 +1006,5 @@ int vringh_need_notify_kern(struct vringh *vrh) 
	return __vringh_need_notify(vrh, getu16_kern);

}

EXPORT_SYMBOL(vringh_need_notify_kern);



MODULE_LICENSE("GPL");