Merge tag 'md/4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md

[cascardo/linux.git] / lib / raid6 / algos.c

diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c
index 149d947..7857049 100644 (file)
--- a/lib/raid6/algos.c
+++ b/lib/raid6/algos.c
@@ -77,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,
@@ -106,6 +109,9 @@ const struct raid6_recov_calls *const raid6_recov_algos[] = {
 #endif
 #ifdef CONFIG_AS_SSSE3
        &raid6_recov_ssse3,
+#endif
+#ifdef CONFIG_S390
+       &raid6_recov_s390xc,
 #endif
        &raid6_recov_intx1,
        NULL