Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / include / asm-s390 / cio.h

diff --git a/include/asm-s390/cio.h b/include/asm-s390/cio.h
index 28fdd6e2b8badf73baa7b53c502f1d2b12e30c51..f738d2827582e01408559acf690cf49399d72ddf 100644 (file)
--- a/include/asm-s390/cio.h
+++ b/include/asm-s390/cio.h
@@ -13,6 +13,7 @@
 #ifdef __KERNEL__
 
 #define LPM_ANYPATH 0xff
+#define __MAX_CSSID 0
 
 /*
  * subchannel status word
@@ -270,15 +271,34 @@ struct diag210 {
        __u32 vrdccrft : 8;    /* real device feature (output) */
 } __attribute__ ((packed,aligned(4)));
 
+struct ccw_dev_id {
+       u8 ssid;
+       u16 devno;
+};
+
+static inline int ccw_dev_id_is_equal(struct ccw_dev_id *dev_id1,
+                                     struct ccw_dev_id *dev_id2)
+{
+       if ((dev_id1->ssid == dev_id2->ssid) &&
+           (dev_id1->devno == dev_id2->devno))
+               return 1;
+       return 0;
+}
+
 extern int diag210(struct diag210 *addr);
 
 extern void wait_cons_dev(void);
 
-extern void clear_all_subchannels(void);
+extern void css_schedule_reprobe(void);
 
-extern void cio_reset_channel_paths(void);
+extern void reipl_ccw_dev(struct ccw_dev_id *id);
 
-extern void css_schedule_reprobe(void);
+struct cio_iplinfo {
+       u16 devno;
+       int is_qdio;
+};
+
+extern int cio_get_iplinfo(struct cio_iplinfo *iplinfo);
 
 #endif