Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit aef2ea912e0ee39fbca74fed0ab8e612ac2c3ba2

Authored by Linus Torvalds
2 parents f722406faa f616fe4fee
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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.

Showing 2 changed files Side-by-side Diff

drivers/lguest/page_tables.c
Diff comments   View file @ aef2ea9
... ... @@ -1002,6 +1002,7 @@
1002 1002 kill_guest(&lg->cpus[0],
1003 1003 "Cannot populate switcher mapping");
1004 1004 }
  1005 + lg->pgdirs[pgdir].last_host_cpu = -1;
1005 1006 }
1006 1007 }
1007 1008  
drivers/vhost/vringh.c
Diff comments   View file @ aef2ea9
... ... @@ -3,6 +3,7 @@
3 3 *
4 4 * Since these may be in userspace, we use (inline) accessors.
5 5 */
  6 +#include <linux/module.h>
6 7 #include <linux/vringh.h>
7 8 #include <linux/virtio_ring.h>
8 9 #include <linux/kernel.h>
... ... @@ -1005,4 +1006,6 @@
1005 1006 return __vringh_need_notify(vrh, getu16_kern);
1006 1007 }
1007 1008 EXPORT_SYMBOL(vringh_need_notify_kern);
  1009 +
  1010 +MODULE_LICENSE("GPL");