3 files changed, 15 insertions, 2 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 7afc1734050..21a7030abbb 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -287,6 +287,14 @@ config MARCH_Z10
           machines such as the z990, z890, z900, z800, z9-109, z9-ec
           and z9-bc.
 
+config MARCH_Z196
+        bool "IBM zEnterprise 196"
+        help
+          Select this to enable optimizations for IBM zEnterprise 196.
+          The kernel will be slightly faster but will not work on older
+          machines such as the z990, z890, z900, z800, z9-109, z9-ec,
+          z9-bc, z10-ec and z10-bc.
+
 endchoice
 
 config PACK_STACK
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 9d318476f81..d5b8a6ade52 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -40,6 +40,7 @@ cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900)
 cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990)
 cflags-$(CONFIG_MARCH_Z9_109) += $(call cc-option,-march=z9-109)
 cflags-$(CONFIG_MARCH_Z10) += $(call cc-option,-march=z10)
+cflags-$(CONFIG_MARCH_Z196) += $(call cc-option,-march=z196)
 
 #KBUILD_IMAGE is necessary for make rpm
 KBUILD_IMAGE    :=arch/s390/boot/image
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index db1696e210a..7061398341d 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -488,7 +488,9 @@ startup:
         .align 16
 2:      .long   0x000a0000,0x8badcccc
 #if defined(CONFIG_64BIT)
-#if defined(CONFIG_MARCH_Z10)
+#if defined(CONFIG_MARCH_Z196)
+        .long 0xc100efe3, 0xf46c0000
+#elif defined(CONFIG_MARCH_Z10)
         .long 0xc100efe3, 0xf0680000
 #elif defined(CONFIG_MARCH_Z9_109)
         .long 0xc100efc3, 0x00000000
@@ -498,7 +500,9 @@ startup:
         .long 0xc0000000, 0x00000000
 #endif
 #else
-#if defined(CONFIG_MARCH_Z10)
+#if defined(CONFIG_MARCH_Z196)
+        .long 0x8100c880, 0x00000000
+#elif defined(CONFIG_MARCH_Z10)
         .long 0x8100c880, 0x00000000
 #elif defined(CONFIG_MARCH_Z9_109)
         .long 0x8100c880, 0x00000000