diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-13 11:50:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-13 11:50:12 +1100 |
| commit | c250c9559825adea403fab6eadf934449eeeec48 (patch) | |
| tree | 7b47d5fa67447e8423dd1bf98b2fff1e9a94563f /arch/s390 | |
| parent | 04b8b048d60e0dee41455f2856018328474edf8c (diff) | |
| parent | aa5ec3085dbbf0a395177ce504f9cb968ab40b08 (diff) | |
Merge remote branch 'kvm/linux-next'
Conflicts:
arch/powerpc/kvm/timing.h
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 07ced89740d7..544505893c9f 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -74,9 +74,10 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { static unsigned long long *facilities; /* Section: not file related */ -void kvm_arch_hardware_enable(void *garbage) +int kvm_arch_hardware_enable(void *garbage) { /* every s390 is virtualization enabled ;-) */ + return 0; } void kvm_arch_hardware_disable(void *garbage) @@ -150,7 +151,7 @@ long kvm_arch_vm_ioctl(struct file *filp, break; } default: - r = -EINVAL; + r = -ENOTTY; } return r; |