Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bdf5679 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

Merge branch 'sthyi' into features 

Add the store-hypervisor-information code into features
using a tip branch for parallel merging into the KVM tree.
parents 91a1fad7 3d8757b8

arch/s390/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -736,7 +736,6 @@ struct kvm_arch{ 
	wait_queue_head_t ipte_wq;

	int ipte_lock_count;

	struct mutex ipte_mutex;

	struct ratelimit_state sthyi_limit;

	spinlock_t start_stop_lock;

	struct sie_page2 *sie_page2;

	struct kvm_s390_cpu_model model;

arch/s390/include/asm/sysinfo.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */

arch/s390/include/uapi/asm/sthyi.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef _UAPI_ASM_STHYI_H

#define _UAPI_ASM_STHYI_H



#define STHYI_FC_CP_IFL_CAP	0



#endif /* _UAPI_ASM_STHYI_H */

arch/s390/include/uapi/asm/unistd.h

+2 −1
Original line number Diff line number Diff line
@@ -315,7 +315,8 @@ 
#define __NR_pwritev2		377

#define __NR_s390_guarded_storage	378

#define __NR_statx		379

#define NR_syscalls 380

#define __NR_s390_sthyi		380

#define NR_syscalls 381



/* 

 * There are some system calls that are not present on 64 bit, some

arch/s390/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ obj-y := traps.o time.o process.o base.o early.o setup.o idle.o vtime.o 
obj-y	+= processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o

obj-y	+= debug.o irq.o ipl.o dis.o diag.o vdso.o als.o

obj-y	+= sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o

obj-y	+= runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o

obj-y	+= runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o

obj-y	+= entry.o reipl.o relocate_kernel.o kdebugfs.o



extra-y				+= head.o head64.o vmlinux.lds