From a836510e967f86954f59b88be9b1c0e5ef7e8084 Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Fri, 5 Oct 2012 10:43:31 +0200
Subject: [PATCH] --- yaml --- r: 333008 b: refs/heads/master c:
 4dcc2a4d6c37c36155ea6d6305f15e599531b862 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/arch/s390/include/asm/chpid.h | 10 +++++-----
 trunk/arch/s390/include/asm/chsc.h  | 10 ++++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 6e7c4cfe700a..785e10b0a3df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9be5f34f3f00828dfe4012578b6467a31f408eab
+refs/heads/master: 4dcc2a4d6c37c36155ea6d6305f15e599531b862
diff --git a/trunk/arch/s390/include/asm/chpid.h b/trunk/arch/s390/include/asm/chpid.h
index e5bde9f9291f..8af0b92c90c6 100644
--- a/trunk/arch/s390/include/asm/chpid.h
+++ b/trunk/arch/s390/include/asm/chpid.h
@@ -1,5 +1,5 @@
 /*
- *    Copyright IBM Corp. 2007
+ *    Copyright IBM Corp. 2007, 2012
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
  */
 
@@ -12,10 +12,10 @@
 #define __MAX_CHPID 255
 
 struct chp_id {
-	u8 reserved1;
-	u8 cssid;
-	u8 reserved2;
-	u8 id;
+	__u8 reserved1;
+	__u8 cssid;
+	__u8 reserved2;
+	__u8 id;
 } __attribute__((packed));
 
 #ifdef __KERNEL__
diff --git a/trunk/arch/s390/include/asm/chsc.h b/trunk/arch/s390/include/asm/chsc.h
index aea451fd182e..1c6a7f85a581 100644
--- a/trunk/arch/s390/include/asm/chsc.h
+++ b/trunk/arch/s390/include/asm/chsc.h
@@ -1,7 +1,7 @@
 /*
  * ioctl interface for /dev/chsc
  *
- * Copyright IBM Corp. 2008
+ * Copyright IBM Corp. 2008, 2012
  * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
  */
 
@@ -9,9 +9,12 @@
 #define _ASM_CHSC_H
 
 #include <linux/types.h>
+#include <linux/ioctl.h>
 #include <asm/chpid.h>
 #include <asm/schid.h>
 
+#define CHSC_SIZE 0x1000
+
 struct chsc_async_header {
 	__u16 length;
 	__u16 code;
@@ -23,15 +26,14 @@ struct chsc_async_header {
 
 struct chsc_async_area {
 	struct chsc_async_header header;
-	__u8 data[PAGE_SIZE - 16 /* size of chsc_async_header */];
+	__u8 data[CHSC_SIZE - sizeof(struct chsc_async_header)];
 } __attribute__ ((packed));
 
-
 struct chsc_response_struct {
 	__u16 length;
 	__u16 code;
 	__u32 parms;
-	__u8 data[PAGE_SIZE - 8];
+	__u8 data[CHSC_SIZE - 2 * sizeof(__u16) - sizeof(__u32)];
 } __attribute__ ((packed));
 
 struct chsc_chp_cd {