Hi Stephen,
we got a report of a compile error due to a clash between the features branch
and the kvm branch for s390. Fixed with the following patch:
--
>From 39e60f02654946c40a3d2b78239316c431588145 Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Tue, 7 Jun 2016 14:49:43 +0200
Subject: [PATCH] s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
git commit 6bc43e18f530bee307135f9dc8636df3b5fc4d42
"KVM: s390: interface to query and configure cpu subfunctions"
and git commit cc8f9465648745ef32e86fee0f182109b6fd67b3
"s390/time: move PTFF definitions"
cause a compile error in arch/s390/kvm/kvm-s390.c. Use the new
ptff defines from arch/s390/include/asm/timex.h.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
---
arch/s390/kvm/kvm-s390.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index fa51aef..14d14b9 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -37,7 +37,7 @@
#include <asm/isc.h>
#include <asm/sclp.h>
#include <asm/cpacf.h>
-#include <asm/etr.h>
+#include <asm/timex.h>
#include "kvm-s390.h"
#include "gaccess.h"
@@ -227,7 +227,8 @@ static void kvm_s390_cpu_feat_init(void)
}
if (test_facility(28)) /* TOD-clock steering */
- etr_ptff(kvm_s390_available_subfunc.ptff, ETR_PTFF_QAF);
+ ptff(kvm_s390_available_subfunc.ptff,
+ sizeof(kvm_s390_available_subfunc.ptff), PTFF_QAF);
if (test_facility(17)) { /* MSA */
__cpacf_query(CPACF_KMAC, kvm_s390_available_subfunc.kmac);
--
2.6.6
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
