Commit 0c2363ff authored by Paolo Bonzini's avatar Paolo Bonzini

Merge tag 'kvms390-20140626' of...

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

Fix sie.h header related problems introduced during the 3.16 development
cycle.
parents 8c9eb041 d09a08e0
...@@ -36,6 +36,7 @@ header-y += signal.h ...@@ -36,6 +36,7 @@ header-y += signal.h
header-y += socket.h header-y += socket.h
header-y += sockios.h header-y += sockios.h
header-y += sclp_ctl.h header-y += sclp_ctl.h
header-y += sie.h
header-y += stat.h header-y += stat.h
header-y += statfs.h header-y += statfs.h
header-y += swab.h header-y += swab.h
......
#ifndef _UAPI_ASM_S390_SIE_H #ifndef _UAPI_ASM_S390_SIE_H
#define _UAPI_ASM_S390_SIE_H #define _UAPI_ASM_S390_SIE_H
#include <asm/sigp.h>
#define diagnose_codes \ #define diagnose_codes \
{ 0x10, "DIAG (0x10) release pages" }, \ { 0x10, "DIAG (0x10) release pages" }, \
{ 0x44, "DIAG (0x44) time slice end" }, \ { 0x44, "DIAG (0x44) time slice end" }, \
...@@ -13,18 +11,18 @@ ...@@ -13,18 +11,18 @@
{ 0x500, "DIAG (0x500) KVM virtio functions" }, \ { 0x500, "DIAG (0x500) KVM virtio functions" }, \
{ 0x501, "DIAG (0x501) KVM breakpoint" } { 0x501, "DIAG (0x501) KVM breakpoint" }
#define sigp_order_codes \ #define sigp_order_codes \
{ SIGP_SENSE, "SIGP sense" }, \ { 0x01, "SIGP sense" }, \
{ SIGP_EXTERNAL_CALL, "SIGP external call" }, \ { 0x02, "SIGP external call" }, \
{ SIGP_EMERGENCY_SIGNAL, "SIGP emergency signal" }, \ { 0x03, "SIGP emergency signal" }, \
{ SIGP_STOP, "SIGP stop" }, \ { 0x05, "SIGP stop" }, \
{ SIGP_STOP_AND_STORE_STATUS, "SIGP stop and store status" }, \ { 0x06, "SIGP restart" }, \
{ SIGP_SET_ARCHITECTURE, "SIGP set architecture" }, \ { 0x09, "SIGP stop and store status" }, \
{ SIGP_SET_PREFIX, "SIGP set prefix" }, \ { 0x0b, "SIGP initial cpu reset" }, \
{ SIGP_SENSE_RUNNING, "SIGP sense running" }, \ { 0x0d, "SIGP set prefix" }, \
{ SIGP_RESTART, "SIGP restart" }, \ { 0x0e, "SIGP store status at address" }, \
{ SIGP_INITIAL_CPU_RESET, "SIGP initial cpu reset" }, \ { 0x12, "SIGP set architecture" }, \
{ SIGP_STORE_STATUS_AT_ADDRESS, "SIGP store status at address" } { 0x15, "SIGP sense running" }
#define icpt_prog_codes \ #define icpt_prog_codes \
{ 0x0001, "Prog Operation" }, \ { 0x0001, "Prog Operation" }, \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment