* [PULL 0/1] KVM: s390: fix for 3.16
@ 2014-06-26 9:09 Cornelia Huck
2014-06-26 9:09 ` [PULL 1/1] KVM: s390: add sie.h uapi header file to Kbuild and remove header dependency Cornelia Huck
2014-06-27 14:14 ` [PULL 0/1] KVM: s390: fix for 3.16 Paolo Bonzini
0 siblings, 2 replies; 3+ messages in thread
From: Cornelia Huck @ 2014-06-26 9:09 UTC (permalink / raw)
To: Paolo Bonzini, Gleb Natapov
Cc: KVM, linux-s390, Christian Borntraeger, Cornelia Huck
Paolo, Gleb,
here's a fix for KVM/s390 for a change that was introduced during
the merge window; therefore, it should go into 3.16. Please pull.
The following changes since commit 5c02c392cd2320e8d612376d6b72b6548a680923:
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux (2014-06-11 21:10:33 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvms390-20140626
for you to fetch changes up to d09a08e030acbb41aadf7fee7b31cb1c5391bb96:
KVM: s390: add sie.h uapi header file to Kbuild and remove header dependency (2014-06-26 10:42:59 +0200)
----------------------------------------------------------------
Fix sie.h header related problems introduced during the 3.16 development
cycle.
----------------------------------------------------------------
Heiko Carstens (1):
KVM: s390: add sie.h uapi header file to Kbuild and remove header
dependency
arch/s390/include/uapi/asm/Kbuild | 1 +
arch/s390/include/uapi/asm/sie.h | 26 ++++++++++++--------------
2 files changed, 13 insertions(+), 14 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL 1/1] KVM: s390: add sie.h uapi header file to Kbuild and remove header dependency
2014-06-26 9:09 [PULL 0/1] KVM: s390: fix for 3.16 Cornelia Huck
@ 2014-06-26 9:09 ` Cornelia Huck
2014-06-27 14:14 ` [PULL 0/1] KVM: s390: fix for 3.16 Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Cornelia Huck @ 2014-06-26 9:09 UTC (permalink / raw)
To: Paolo Bonzini, Gleb Natapov
Cc: KVM, linux-s390, Christian Borntraeger, Heiko Carstens,
Cornelia Huck
From: Heiko Carstens <heiko.carstens@de.ibm.com>
sie.h was missing in arch/s390/include/uapi/asm/Kbuild and therefore missed
the "make headers_check" target.
If added it reveals that also arch/s390/include/asm/sigp.h would become uapi.
This is something we certainly do not want. So remove that dependency as well.
The header file was merged with ceae283bb2e0176c "KVM: s390: add sie exit
reasons tables", therefore we never had a kernel release with this commit and
can still change anything.
Acked-by: Alexander Yarygin <yarygin@linux.vnet.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
arch/s390/include/uapi/asm/Kbuild | 1 +
arch/s390/include/uapi/asm/sie.h | 26 ++++++++++++--------------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild
index 6a9a9eb..7366373 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 3d97f61..5d9cc19 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" }, \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PULL 0/1] KVM: s390: fix for 3.16
2014-06-26 9:09 [PULL 0/1] KVM: s390: fix for 3.16 Cornelia Huck
2014-06-26 9:09 ` [PULL 1/1] KVM: s390: add sie.h uapi header file to Kbuild and remove header dependency Cornelia Huck
@ 2014-06-27 14:14 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2014-06-27 14:14 UTC (permalink / raw)
To: Cornelia Huck, Gleb Natapov; +Cc: KVM, linux-s390, Christian Borntraeger
Il 26/06/2014 11:09, Cornelia Huck ha scritto:
> git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvms390-20140626
Applying, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-27 14:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-26 9:09 [PULL 0/1] KVM: s390: fix for 3.16 Cornelia Huck
2014-06-26 9:09 ` [PULL 1/1] KVM: s390: add sie.h uapi header file to Kbuild and remove header dependency Cornelia Huck
2014-06-27 14:14 ` [PULL 0/1] KVM: s390: fix for 3.16 Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).