瀏覽代碼

[S390] sysinfo: display capacity adjustment indicator

Display machine capacity adjustment indicator and capacity
change reason if available in /proc/sysinfo.

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

+ 4 - 1
arch/s390/include/asm/sysinfo.h

@@ -15,7 +15,10 @@
 #define __ASM_S390_SYSINFO_H
 #define __ASM_S390_SYSINFO_H
 
 
 struct sysinfo_1_1_1 {
 struct sysinfo_1_1_1 {
-	char reserved_0[32];
+	unsigned short :16;
+	unsigned char ccr;
+	unsigned char cai;
+	char reserved_0[28];
 	char manufacturer[16];
 	char manufacturer[16];
 	char type[4];
 	char type[4];
 	char reserved_1[12];
 	char reserved_1[12];

+ 7 - 0
arch/s390/kernel/sysinfo.c

@@ -74,6 +74,13 @@ static int stsi_1_1_1(struct sysinfo_1_1_1 *info, char *page, int len)
 			       "Model Temp. Capacity: %-16.16s %08u\n",
 			       "Model Temp. Capacity: %-16.16s %08u\n",
 			       info->model_temp_cap,
 			       info->model_temp_cap,
 			       *(u32 *) info->model_temp_cap_rating);
 			       *(u32 *) info->model_temp_cap_rating);
+	if (info->cai) {
+		len += sprintf(page + len,
+			       "Capacity Adj. Ind.:   %d\n",
+			       info->cai);
+		len += sprintf(page + len, "Capacity Ch. Reason:  %d\n",
+			       info->ccr);
+	}
 	return len;
 	return len;
 }
 }