diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-12 13:28:18 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-12 13:28:20 +1000 |
| commit | 12395438273bf9457495e63f8baf93345781ac88 (patch) | |
| tree | c2966ea8332e61c48d3ee99c893677fb49c081ae /virt | |
| parent | c5d5579a19e85764b64e15f8dab68108310b301a (diff) | |
| parent | ea8adcaa2d6a9d8b3f9c19975f4328e1e7b81840 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
Documentation/block/cmdline-partition.txt
drivers/block/aoe/aoeblk.c
drivers/rtc/rtc-hid-sensor-time.c
fs/namei.c
fs/namespace.c
include/linux/smp.h
kernel/fork.c
mm/mempolicy.c
mm/mlock.c
mm/sparse.c
scripts/checkpatch.pl
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/async_pf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c index ea475cd03511..b44cea0804f8 100644 --- a/virt/kvm/async_pf.c +++ b/virt/kvm/async_pf.c @@ -20,6 +20,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <linux/sched.h> #include <linux/kvm_host.h> #include <linux/slab.h> #include <linux/module.h> |