Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / s390 / include / asm / chsc.h

diff --git a/arch/s390/include/asm/chsc.h b/arch/s390/include/asm/chsc.h
index 807997f..4943654 100644 (file)
--- a/arch/s390/include/asm/chsc.h
+++ b/arch/s390/include/asm/chsc.h
@@ -125,4 +125,32 @@ 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