From 442ebb51cb11c6e9322dd8adaab9ff257a650557 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 25 Oct 2010 16:10:16 +0200 Subject: [PATCH] --- yaml --- r: 216747 b: refs/heads/master c: 7aca2eda5c2a45884ff0ce0bb1ebfa8f83c1e0f9 h: refs/heads/master i: 216745: f48ee34a002c2ab7529503c2974cfcc6e9c5b609 216743: 923e86a1869754b34748f9df9252a53a9ebe09b8 v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/sysinfo.h | 5 ++++- trunk/arch/s390/kernel/sysinfo.c | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0bea86c6f14c..e53d98e4745b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b8c12b120071d1db2212a439ccfebcb0ab0cf2a +refs/heads/master: 7aca2eda5c2a45884ff0ce0bb1ebfa8f83c1e0f9 diff --git a/trunk/arch/s390/include/asm/sysinfo.h b/trunk/arch/s390/include/asm/sysinfo.h index 22bdb2a0ee5f..c2ece4dd6c0a 100644 --- a/trunk/arch/s390/include/asm/sysinfo.h +++ b/trunk/arch/s390/include/asm/sysinfo.h @@ -15,7 +15,10 @@ #define __ASM_S390_SYSINFO_H 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 type[4]; char reserved_1[12]; diff --git a/trunk/arch/s390/kernel/sysinfo.c b/trunk/arch/s390/kernel/sysinfo.c index a0ffc7717ed6..a91274b4eb8f 100644 --- a/trunk/arch/s390/kernel/sysinfo.c +++ b/trunk/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", info->model_temp_cap, *(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; }