diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-10-09 12:16:49 +0300 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-10-09 12:16:49 +0300 |
| commit | 3bdf5679c9e46088a0d677e795afc92b5f77940f (patch) | |
| tree | be5a99e62b5ff078413d71297154ece9f724ec9e /arch/s390/include/asm/sysinfo.h | |
| parent | 91a1fad759ffd616b836984ca0420c7ad5996eef (diff) | |
| parent | 3d8757b87d7fc15a87928bc970f060bc9c6dc618 (diff) | |
| download | linux-3bdf5679c9e46088a0d677e795afc92b5f77940f.tar.xz | |
Merge branch 'sthyi' into features
Add the store-hypervisor-information code into features
using a tip branch for parallel merging into the KVM tree.
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 0f09135f0ae4..a702cb9d4269 100644 --- a/arch/s390/include/asm/sysinfo.h +++ b/arch/s390/include/asm/sysinfo.h @@ -199,4 +199,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 */ |