diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-13 07:59:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-13 07:59:08 -0700 |
| commit | aef2ea912e0ee39fbca74fed0ab8e612ac2c3ba2 (patch) | |
| tree | 96ea79c7763c1fb5df000449ef898cd184bc7ef6 | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
| parent | f616fe4feee4000c2995d2d1e1981513bf9ab0d4 (diff) | |
| download | linux-aef2ea912e0ee39fbca74fed0ab8e612ac2c3ba2.tar.bz2 | |
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.
| -rw-r--r-- | drivers/lguest/page_tables.c | 1 | ||||
| -rw-r--r-- | drivers/vhost/vringh.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c index 699187ab3800..5b9ac32801c7 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c @@ -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; } } diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c index bff0775e258c..5174ebac288d 100644 --- a/drivers/vhost/vringh.c +++ b/drivers/vhost/vringh.c @@ -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"); |