Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fixes from Paolo Bonzini:
 "A bunch of one-liners (except the s390 one).

  The two more serious bugs ("KVM: SVM: Fix CPL export via SS.DPL" and
  "KVM: s390: add sie.h uapi header file to Kbuild and remove header
  dependency") were introduced in the 3.16 merge window"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: SVM: Fix CPL export via SS.DPL
  KVM: s390: add sie.h uapi header file to Kbuild and remove header dependency
  MIPS: KVM: Fix memory leak on VCPU
  KVM: x86: preserve the high 32-bits of the PAT register
  kvm: fix wrong address when writing Hyper-V tsc page
  KVM: x86: Increase the number of fixed MTRR regs to 10

2 files changed, 13 insertions, 14 deletions

diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild
index 6a9a9eb645f5..736637363d31 100644
--- a/arch/s390/include/uapi/asm/Kbuild
+++ b/arch/s390/include/uapi/asm/Kbuild
@@ -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
diff --git a/arch/s390/include/uapi/asm/sie.h b/arch/s390/include/uapi/asm/sie.h
index 3d97f610198d..5d9cc19462c4 100644
--- a/arch/s390/include/uapi/asm/sie.h
+++ b/arch/s390/include/uapi/asm/sie.h
@@ -1,8 +1,6 @@
 #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" },                 \
@@ -13,18 +11,18 @@
         { 0x500, "DIAG (0x500) KVM virtio functions" },         \
         { 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" }
+#define sigp_order_codes                                        \
+        { 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" },                           \