From 98448bf2f1c474c26c260ddc8c12f029e53406e2 Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Tue, 28 Aug 2012 16:43:36 +0200
Subject: [PATCH] --- yaml --- r: 324063 b: refs/heads/master c:
 382b73663529b756914cf17a9912c9cf00cf0025 h: refs/heads/master i:   324061:
 2163fa146ec72b4187eb4dcef60ddf2a4704bd7b   324059:
 d8f61c61d4449aa7e0e83afa5ad67d04dd87951d   324055:
 3daa04912ab8f1e4056310c029bfe2f789f0ed4a   324047:
 27f0058c3e09333a01a46ab524107fd7e83f02bc   324031:
 5c85cd9b3fede432367f7251f67739c5b2a836a4 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/s390/include/asm/chsc.h      | 28 ------------------
 trunk/arch/s390/include/asm/css_chars.h | 39 +++++++++++++++++++++++++
 trunk/arch/s390/include/asm/scsw.h      |  2 +-
 trunk/drivers/s390/block/dasd_eckd.c    |  3 +-
 trunk/drivers/s390/cio/chsc.h           |  1 +
 6 files changed, 43 insertions(+), 32 deletions(-)
 create mode 100644 trunk/arch/s390/include/asm/css_chars.h

diff --git a/[refs] b/[refs]
index c4bdcefcfa5e..381077e3a218 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01c5e6dc119bf2112e363477e3b056f6b54f2d79
+refs/heads/master: 382b73663529b756914cf17a9912c9cf00cf0025
diff --git a/trunk/arch/s390/include/asm/chsc.h b/trunk/arch/s390/include/asm/chsc.h
index bf115b49f444..aea451fd182e 100644
--- a/trunk/arch/s390/include/asm/chsc.h
+++ b/trunk/arch/s390/include/asm/chsc.h
@@ -125,32 +125,4 @@ struct chsc_cpd_info {
 #define CHSC_INFO_CPD _IOWR(CHSC_IOCTL_MAGIC, 0x87, struct chsc_cpd_info)
 #define CHSC_INFO_DCAL _IOWR(CHSC_IOCTL_MAGIC, 0x88, struct chsc_dcal)
 
-#ifdef __KERNEL__
-
-struct css_general_char {
-	u64 : 12;
-	u32 dynio : 1;	 /* bit 12 */
-	u32 : 28;
-	u32 aif : 1;	 /* bit 41 */
-	u32 : 3;
-	u32 mcss : 1;	 /* bit 45 */
-	u32 fcs : 1;	 /* bit 46 */
-	u32 : 1;
-	u32 ext_mb : 1;  /* bit 48 */
-	u32 : 7;
-	u32 aif_tdd : 1; /* bit 56 */
-	u32 : 1;
-	u32 qebsm : 1;	 /* bit 58 */
-	u32 : 8;
-	u32 aif_osa : 1; /* bit 67 */
-	u32 : 14;
-	u32 cib : 1;	 /* bit 82 */
-	u32 : 5;
-	u32 fcx : 1;	 /* bit 88 */
-	u32 : 7;
-}__attribute__((packed));
-
-extern struct css_general_char css_general_characteristics;
-
-#endif /* __KERNEL__ */
 #endif
diff --git a/trunk/arch/s390/include/asm/css_chars.h b/trunk/arch/s390/include/asm/css_chars.h
new file mode 100644
index 000000000000..a06ebc2623fb
--- /dev/null
+++ b/trunk/arch/s390/include/asm/css_chars.h
@@ -0,0 +1,39 @@
+#ifndef _ASM_CSS_CHARS_H
+#define _ASM_CSS_CHARS_H
+
+#include <linux/types.h>
+
+#ifdef __KERNEL__
+
+struct css_general_char {
+	u64 : 12;
+	u32 dynio : 1;	 /* bit 12 */
+	u32 : 4;
+	u32 eadm : 1;	 /* bit 17 */
+	u32 : 23;
+	u32 aif : 1;	 /* bit 41 */
+	u32 : 3;
+	u32 mcss : 1;	 /* bit 45 */
+	u32 fcs : 1;	 /* bit 46 */
+	u32 : 1;
+	u32 ext_mb : 1;  /* bit 48 */
+	u32 : 7;
+	u32 aif_tdd : 1; /* bit 56 */
+	u32 : 1;
+	u32 qebsm : 1;	 /* bit 58 */
+	u32 : 8;
+	u32 aif_osa : 1; /* bit 67 */
+	u32 : 12;
+	u32 eadm_rf : 1; /* bit 80 */
+	u32 : 1;
+	u32 cib : 1;	 /* bit 82 */
+	u32 : 5;
+	u32 fcx : 1;	 /* bit 88 */
+	u32 : 19;
+	u32 alt_ssi : 1; /* bit 108 */
+} __packed;
+
+extern struct css_general_char css_general_characteristics;
+
+#endif /* __KERNEL__ */
+#endif
diff --git a/trunk/arch/s390/include/asm/scsw.h b/trunk/arch/s390/include/asm/scsw.h
index 4071d00978cb..8096bfe67424 100644
--- a/trunk/arch/s390/include/asm/scsw.h
+++ b/trunk/arch/s390/include/asm/scsw.h
@@ -9,7 +9,7 @@
 #define _ASM_S390_SCSW_H_
 
 #include <linux/types.h>
-#include <asm/chsc.h>
+#include <asm/css_chars.h>
 #include <asm/cio.h>
 
 /**
diff --git a/trunk/drivers/s390/block/dasd_eckd.c b/trunk/drivers/s390/block/dasd_eckd.c
index c48c72abbefc..ed03c22b215e 100644
--- a/trunk/drivers/s390/block/dasd_eckd.c
+++ b/trunk/drivers/s390/block/dasd_eckd.c
@@ -20,6 +20,7 @@
 #include <linux/compat.h>
 #include <linux/init.h>
 
+#include <asm/css_chars.h>
 #include <asm/debug.h>
 #include <asm/idals.h>
 #include <asm/ebcdic.h>
@@ -31,8 +32,6 @@
 
 #include "dasd_int.h"
 #include "dasd_eckd.h"
-#include "../cio/chsc.h"
-
 
 #ifdef PRINTK_HEADER
 #undef PRINTK_HEADER
diff --git a/trunk/drivers/s390/cio/chsc.h b/trunk/drivers/s390/cio/chsc.h
index 3f15b2aaeaea..b5261f318fe8 100644
--- a/trunk/drivers/s390/cio/chsc.h
+++ b/trunk/drivers/s390/cio/chsc.h
@@ -3,6 +3,7 @@
 
 #include <linux/types.h>
 #include <linux/device.h>
+#include <asm/css_chars.h>
 #include <asm/chpid.h>
 #include <asm/chsc.h>
 #include <asm/schid.h>