Merge tag 'kvm-4.14-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / arch / s390 / tools / gen_facilities.c

diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c
index 19f12cef5bdfbace38ad6c258348d806f86ebb42..70dd8f17d0547ebc2c2ee059b0e54834b67c0f79 100644 (file)
--- a/arch/s390/tools/gen_facilities.c
+++ b/arch/s390/tools/gen_facilities.c
@@ -41,7 +41,7 @@ static struct facility_def facility_defs[] = {
                        27, /* mvcos */
                        32, /* compare and swap and store */
                        33, /* compare and swap and store 2 */
-                       34, /* general extension facility */
+                       34, /* general instructions extension */
                        35, /* execute extensions */
 #endif
 #ifdef CONFIG_HAVE_MARCH_Z196_FEATURES
@@ -53,6 +53,9 @@ static struct facility_def facility_defs[] = {
 #endif
 #ifdef CONFIG_HAVE_MARCH_Z13_FEATURES
                        53, /* load-and-zero-rightmost-byte, etc. */
+#endif
+#ifdef CONFIG_HAVE_MARCH_Z14_FEATURES
+                       58, /* miscellaneous-instruction-extension 2 */
 #endif
                        -1 /* END */
                }