diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 22:22:53 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 22:22:53 (GMT) |
| commit | 8e8b180a5f1b237345f6e2d960bcceb8b6bc3793 (patch) | |
| tree | 9f10c874b0d13cc4929ff2b68c65ae2d48d4fb9d /drivers/xen/xenbus | |
| parent | 56a79b7b021bf1b08334e63c2c14b280e2dbf47a (diff) | |
| parent | 45e27161c62216c163880d7aed751cb55a65c8e9 (diff) | |
| download | linux-fsl-qoriq-8e8b180a5f1b237345f6e2d960bcceb8b6bc3793.tar.xz | |
Merge tag 'stable/for-linus-3.9-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
- Update the Xen ACPI memory and CPU hotplug locking mechanism.
- Fix PAT issues wherein various applications would not start
- Fix handling of multiple MSI as AHCI now does it.
- Fix ARM compile failures.
* tag 'stable/for-linus-3.9-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xenbus: fix compile failure on ARM with Xen enabled
xen/pci: We don't do multiple MSI's.
xen/pat: Disable PAT using pat_enabled value.
xen/acpi: xen cpu hotplug minor updates
xen/acpi: xen memory hotplug minor updates
Diffstat (limited to 'drivers/xen/xenbus')
| -rw-r--r-- | drivers/xen/xenbus/xenbus_client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c index bcf3ba4..61786be 100644 --- a/drivers/xen/xenbus/xenbus_client.c +++ b/drivers/xen/xenbus/xenbus_client.c @@ -30,6 +30,7 @@ * IN THE SOFTWARE. */ +#include <linux/mm.h> #include <linux/slab.h> #include <linux/types.h> #include <linux/spinlock.h> |