diff options
| author | Al Viro | 2016-01-09 03:20:11 +0100 |
|---|---|---|
| committer | Al Viro | 2016-01-09 03:20:11 +0100 |
| commit | 6108209c4ae964836f6bac5210f1c64153800b62 (patch) | |
| tree | 83651902b46af6bbf8d2ea4841b397bac306095b /arch/x86 | |
| parent | fs: use block_device name vsprintf helper (diff) | |
| parent | compat_ioctl: don't call do_ioctl under set_fs(KERNEL_DS) (diff) | |
| download | kernel-qcow2-linux-6108209c4ae964836f6bac5210f1c64153800b62.tar.gz kernel-qcow2-linux-6108209c4ae964836f6bac5210f1c64153800b62.tar.xz kernel-qcow2-linux-6108209c4ae964836f6bac5210f1c64153800b62.zip | |
Merge branch 'for-linus' into work.misc
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/suspend.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index 3705eabd7e22..df0c40559583 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c @@ -1,6 +1,7 @@ #include <linux/types.h> #include <linux/tick.h> +#include <xen/xen.h> #include <xen/interface/xen.h> #include <xen/grant_table.h> #include <xen/events.h> |