diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-22 12:55:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-22 12:55:17 -0700 |
commit | 55fc733c7e1de05a03237d857f4fe6dcec52d8d9 (patch) | |
tree | a3f5d48c02fc9d0cf569519e645709cac9bf8d1c /drivers/xen/xenbus/xenbus_dev_backend.c | |
parent | b852495908cd1b02ad47672a83f622ad4264801b (diff) | |
parent | e01dc539df3ada9061a1097224513236b5381349 (diff) | |
download | linux-55fc733c7e1de05a03237d857f4fe6dcec52d8d9.tar.gz linux-55fc733c7e1de05a03237d857f4fe6dcec52d8d9.tar.bz2 linux-55fc733c7e1de05a03237d857f4fe6dcec52d8d9.zip |
Merge tag 'for-linus-4.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from David Vrabel:
"Features and fixes for 4.6:
- Make earlyprintk=xen work for HVM guests
- Remove module support for things never built as modules"
* tag 'for-linus-4.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
drivers/xen: make platform-pci.c explicitly non-modular
drivers/xen: make sys-hypervisor.c explicitly non-modular
drivers/xen: make xenbus_dev_[front/back]end explicitly non-modular
drivers/xen: make [xen-]ballon explicitly non-modular
xen: audit usages of module.h ; remove unnecessary instances
xen/x86: Drop mode-selecting ifdefs in startup_xen()
xen/x86: Zero out .bss for PV guests
hvc_xen: make early_printk work with HVM guests
hvc_xen: fix xenboot for DomUs
hvc_xen: add earlycon support
Diffstat (limited to 'drivers/xen/xenbus/xenbus_dev_backend.c')
-rw-r--r-- | drivers/xen/xenbus/xenbus_dev_backend.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/xen/xenbus/xenbus_dev_backend.c b/drivers/xen/xenbus/xenbus_dev_backend.c index ee6d9efd7b76..4a41ac9af966 100644 --- a/drivers/xen/xenbus/xenbus_dev_backend.c +++ b/drivers/xen/xenbus/xenbus_dev_backend.c @@ -5,7 +5,7 @@ #include <linux/mm.h> #include <linux/fs.h> #include <linux/miscdevice.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/capability.h> #include <xen/xen.h> @@ -18,8 +18,6 @@ #include "xenbus_comms.h" -MODULE_LICENSE("GPL"); - static int xenbus_backend_open(struct inode *inode, struct file *filp) { if (!capable(CAP_SYS_ADMIN)) @@ -132,11 +130,4 @@ static int __init xenbus_backend_init(void) pr_err("Could not register xenbus backend device\n"); return err; } - -static void __exit xenbus_backend_exit(void) -{ - misc_deregister(&xenbus_backend_dev); -} - -module_init(xenbus_backend_init); -module_exit(xenbus_backend_exit); +device_initcall(xenbus_backend_init); |