Commit 85949977 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvms390-20140626' of... 

Merge tag 'kvms390-20140626' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

Fix sie.h header related problems introduced during the 3.16 development
cycle.
parents dc720f95 d09a08e0

arch/s390/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ header-y += signal.h 
header-y += socket.h

header-y += sockios.h

header-y += sclp_ctl.h

header-y += sie.h

header-y += stat.h

header-y += statfs.h

header-y += swab.h

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

+12 −14
Original line number Diff line number Diff line 
#ifndef _UAPI_ASM_S390_SIE_H

#define _UAPI_ASM_S390_SIE_H



#include <asm/sigp.h>



#define diagnose_codes						\

	{ 0x10, "DIAG (0x10) release pages" },			\

	{ 0x44, "DIAG (0x44) time slice end" },			\
@@ -14,17 +12,17 @@ 
	{ 0x501, "DIAG (0x501) KVM breakpoint" }



#define sigp_order_codes					\

	{ SIGP_SENSE, "SIGP sense" },					\

	{ SIGP_EXTERNAL_CALL, "SIGP external call" },			\

	{ SIGP_EMERGENCY_SIGNAL, "SIGP emergency signal" },		\

	{ SIGP_STOP, "SIGP stop" },					\

	{ SIGP_STOP_AND_STORE_STATUS, "SIGP stop and store status" },	\

	{ SIGP_SET_ARCHITECTURE, "SIGP set architecture" },		\

	{ SIGP_SET_PREFIX, "SIGP set prefix" },				\

	{ SIGP_SENSE_RUNNING, "SIGP sense running" },			\

	{ SIGP_RESTART, "SIGP restart" },				\

	{ SIGP_INITIAL_CPU_RESET, "SIGP initial cpu reset" },		\

	{ SIGP_STORE_STATUS_AT_ADDRESS, "SIGP store status at address" }

	{ 0x01, "SIGP sense" },					\

	{ 0x02, "SIGP external call" },				\

	{ 0x03, "SIGP emergency signal" },			\

	{ 0x05, "SIGP stop" },					\

	{ 0x06, "SIGP restart" },				\

	{ 0x09, "SIGP stop and store status" },			\

	{ 0x0b, "SIGP initial cpu reset" },			\

	{ 0x0d, "SIGP set prefix" },				\

	{ 0x0e, "SIGP store status at address" },		\

	{ 0x12, "SIGP set architecture" },			\

	{ 0x15, "SIGP sense running" }



#define icpt_prog_codes						\

	{ 0x0001, "Prog Operation" },				\