etr_ptff definitions are moved and renamed but we missed updating them
here and as a result s390 defconfig and allmodconfig was failing with
the error:
arch/s390/kvm/kvm-s390.c:230:45: error: 'ETR_PTFF_QAF' undeclared
Fixes: cc8f94656487 ("s390/time: move PTFF definitions")
Signed-off-by: Sudip Mukherjee <sudip.mukher...@codethink.co.uk>
---
s390 defconfig build log is at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/135776067
arch/s390/kvm/kvm-s390.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index fa51aef..3039eaf 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -29,7 +29,7 @@
#include <linux/bitmap.h>
#include <asm/asm-offsets.h>
#include <asm/lowcore.h>
-#include <asm/etr.h>
+#include <asm/timex.h>
#include <asm/pgtable.h>
#include <asm/gmap.h>
#include <asm/nmi.h>
@@ -227,7 +227,9 @@ 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);
--
1.9.1
