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/events | |
| parent | b852495908cd1b02ad47672a83f622ad4264801b (diff) | |
| parent | e01dc539df3ada9061a1097224513236b5381349 (diff) | |
| download | blackbird-op-linux-55fc733c7e1de05a03237d857f4fe6dcec52d8d9.tar.gz blackbird-op-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/events')
| -rw-r--r-- | drivers/xen/events/events_2l.c | 1 | ||||
| -rw-r--r-- | drivers/xen/events/events_base.c | 2 | ||||
| -rw-r--r-- | drivers/xen/events/events_fifo.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/drivers/xen/events/events_2l.c b/drivers/xen/events/events_2l.c index 403fe3955393..bdff01095f54 100644 --- a/drivers/xen/events/events_2l.c +++ b/drivers/xen/events/events_2l.c @@ -9,7 +9,6 @@ #include <linux/linkage.h> #include <linux/interrupt.h> #include <linux/irq.h> -#include <linux/module.h> #include <asm/sync_bitops.h> #include <asm/xen/hypercall.h> diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index 524c22146429..488017a0806a 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -26,7 +26,7 @@ #include <linux/linkage.h> #include <linux/interrupt.h> #include <linux/irq.h> -#include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/string.h> #include <linux/bootmem.h> #include <linux/slab.h> diff --git a/drivers/xen/events/events_fifo.c b/drivers/xen/events/events_fifo.c index eff2b88003d9..9289a17712e2 100644 --- a/drivers/xen/events/events_fifo.c +++ b/drivers/xen/events/events_fifo.c @@ -36,7 +36,6 @@ #include <linux/linkage.h> #include <linux/interrupt.h> #include <linux/irq.h> -#include <linux/module.h> #include <linux/smp.h> #include <linux/percpu.h> #include <linux/cpu.h> |
