Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / arch / s390 / oprofile / hwsampler.c

diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c
index 3d48f4d..4952872 100644 (file)
--- a/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@ -517,12 +517,8 @@ stop_exit:
 
 static int check_hardware_prerequisites(void)
 {
-       unsigned long long facility_bits[2];
-
-       memcpy(facility_bits, S390_lowcore.stfle_fac_list, 32);
-       if (!(facility_bits[1] & (1ULL << 59)))
+       if (!test_facility(68))
                return -EOPNOTSUPP;
-
        return 0;
 }
 /*