瀏覽代碼

s390: add z13s model number to z13 elf platform

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Heiko Carstens 9 年之前
父節點
當前提交
bb3aa61401
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 4 4
      arch/s390/Kconfig
  2. 1 0
      arch/s390/kernel/setup.c

+ 4 - 4
arch/s390/Kconfig

@@ -254,12 +254,12 @@ config MARCH_ZEC12
 	  older machines.
 	  older machines.
 
 
 config MARCH_Z13
 config MARCH_Z13
-	bool "IBM z13"
+	bool "IBM z13s and z13"
 	select HAVE_MARCH_Z13_FEATURES
 	select HAVE_MARCH_Z13_FEATURES
 	help
 	help
-	  Select this to enable optimizations for IBM z13 (2964 series).
-	  The kernel will be slightly faster but will not work on older
-	  machines.
+	  Select this to enable optimizations for IBM z13s and z13 (2965 and
+	  2964 series). The kernel will be slightly faster but will not work on
+	  older machines.
 
 
 endchoice
 endchoice
 
 

+ 1 - 0
arch/s390/kernel/setup.c

@@ -779,6 +779,7 @@ static int __init setup_hwcaps(void)
 		strcpy(elf_platform, "zEC12");
 		strcpy(elf_platform, "zEC12");
 		break;
 		break;
 	case 0x2964:
 	case 0x2964:
+	case 0x2965:
 		strcpy(elf_platform, "z13");
 		strcpy(elf_platform, "z13");
 		break;
 		break;
 	}
 	}