diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-11-16 16:39:46 +0300 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-11-16 16:39:46 +0300 |
| commit | a6014f1ab7088dc02b58991cfb6b32a34afdbf12 (patch) | |
| tree | 9076c27473660cd1ede44be8c8c5835836114e1b /arch/s390/include/asm/sysinfo.h | |
| parent | 61d750773df388632b11a6170098e2865977e1f6 (diff) | |
| parent | da9a1446d248f673a8560ce46251ff620214ab7b (diff) | |
| download | linux-a6014f1ab7088dc02b58991cfb6b32a34afdbf12.tar.xz | |
Merge tag 'kvm-s390-next-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
KVM: s390: fixes and improvements for 4.15
- Some initial preparation patches for exitless interrupts and crypto
- New capability for AIS migration
- Fixes
- merge of the sthyi tree from the base s390 team, which moves the sthyi
out of KVM into a shared function also for non-KVM
Diffstat (limited to 'arch/s390/include/asm/sysinfo.h')
| -rw-r--r-- | arch/s390/include/asm/sysinfo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/sysinfo.h b/arch/s390/include/asm/sysinfo.h index 2b498e58b914..e4a28307bc5d 100644 --- a/arch/s390/include/asm/sysinfo.h +++ b/arch/s390/include/asm/sysinfo.h @@ -198,4 +198,5 @@ struct service_level { int register_service_level(struct service_level *); int unregister_service_level(struct service_level *); +int sthyi_fill(void *dst, u64 *rc); #endif /* __ASM_S390_SYSINFO_H */ |