Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[karo-tx-linux.git] / lib / raid6 / algos.c

diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c
index 975c6e0434bde0b4b804654822928899ac9e9e2a..7857049fd7d3660022e9372fdd5a11adc243099b 100644 (file)
--- a/lib/raid6/algos.c
+++ b/lib/raid6/algos.c
@@ -49,6 +49,10 @@ const struct raid6_calls * const raid6_algos[] = {
        &raid6_avx2x1,
        &raid6_avx2x2,
 #endif
+#ifdef CONFIG_AS_AVX512
+       &raid6_avx512x1,
+       &raid6_avx512x2,
+#endif
 #endif
 #if defined(__x86_64__) && !defined(__arch_um__)
        &raid6_sse2x1,
@@ -59,6 +63,11 @@ const struct raid6_calls * const raid6_algos[] = {
        &raid6_avx2x2,
        &raid6_avx2x4,
 #endif
+#ifdef CONFIG_AS_AVX512
+       &raid6_avx512x1,
+       &raid6_avx512x2,
+       &raid6_avx512x4,
+#endif
 #endif
 #ifdef CONFIG_ALTIVEC
        &raid6_altivec1,
@@ -68,6 +77,9 @@ const struct raid6_calls * const raid6_algos[] = {
 #endif
 #if defined(CONFIG_TILEGX)
        &raid6_tilegx8,
+#endif
+#if defined(CONFIG_S390)
+       &raid6_s390vx8,
 #endif
        &raid6_intx1,
        &raid6_intx2,
@@ -89,11 +101,17 @@ void (*raid6_datap_recov)(int, size_t, int, void **);
 EXPORT_SYMBOL_GPL(raid6_datap_recov);
 
 const struct raid6_recov_calls *const raid6_recov_algos[] = {
+#ifdef CONFIG_AS_AVX512
+       &raid6_recov_avx512,
+#endif
 #ifdef CONFIG_AS_AVX2
        &raid6_recov_avx2,
 #endif
 #ifdef CONFIG_AS_SSSE3
        &raid6_recov_ssse3,
+#endif
+#ifdef CONFIG_S390
+       &raid6_recov_s390xc,
 #endif
        &raid6_recov_intx1,
        NULL