From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 26 Feb 2010 21:37:39 +0000 (+0100)
Subject: [S390] sysinfo: fix SYSIB 3,2,2 structure
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8387c736fcbaec17890b8d075ee4f4623518b54a;p=deliverable%2Flinux.git

[S390] sysinfo: fix SYSIB 3,2,2 structure

The size of the field that contains the description block count is
only four bits instead of eight bits.
The first four bits are reserved but this might change and break.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/include/asm/sysinfo.h b/arch/s390/include/asm/sysinfo.h
index 9d70057d828c..22bdb2a0ee5f 100644
--- a/arch/s390/include/asm/sysinfo.h
+++ b/arch/s390/include/asm/sysinfo.h
@@ -87,7 +87,8 @@ struct sysinfo_2_2_2 {
 
 struct sysinfo_3_2_2 {
 	char reserved_0[31];
-	unsigned char count;
+	unsigned char :4;
+	unsigned char count:4;
 	struct {
 		char reserved_0[4];
 		unsigned short cpus_total;