diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-13 13:34:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-13 13:34:38 -0700 |
| commit | f47e331042fd5c98f8b4aebc224e7a48fd73e8bd (patch) | |
| tree | 7404afd384dd5c609b6685f666f2b24aa1438a8c /include | |
| parent | bbc54a00d8a3f664cb4bd9619a5c33d75f13d62b (diff) | |
| parent | af6fc858a35b90e89ea7a7ee58e66628c55c776b (diff) | |
| download | infiniband-f47e331042fd5c98f8b4aebc224e7a48fd73e8bd.tar.gz | |
Merge tag 'stable/for-linus-4.0-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen bug fixes from David Vrabel:
- fix a PV regression in 3.19.
- fix a dom0 crash on hosts with large numbers of PIRQs.
- prevent pcifront from disabling memory or I/O port access, which may
trigger host crashes.
* tag 'stable/for-linus-4.0-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen-pciback: limit guest control of command register
xen/events: avoid NULL pointer dereference in dom0 on large machines
xen: Remove trailing semicolon from xenbus_register_frontend() definition
x86/xen: correct bug in p2m list initialization
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/xenbus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index b78f21caf55aa0..b0f1c9e5d68781 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h @@ -114,9 +114,9 @@ int __must_check __xenbus_register_backend(struct xenbus_driver *drv, const char *mod_name); #define xenbus_register_frontend(drv) \ - __xenbus_register_frontend(drv, THIS_MODULE, KBUILD_MODNAME); + __xenbus_register_frontend(drv, THIS_MODULE, KBUILD_MODNAME) #define xenbus_register_backend(drv) \ - __xenbus_register_backend(drv, THIS_MODULE, KBUILD_MODNAME); + __xenbus_register_backend(drv, THIS_MODULE, KBUILD_MODNAME) void xenbus_unregister_driver(struct xenbus_driver *drv); |