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

[karo-tx-linux.git] / drivers / s390 / cio / io_sch.h

diff --git a/drivers/s390/cio/io_sch.h b/drivers/s390/cio/io_sch.h
index 76253dfcc1be86a18eba7ac7ea4d6f53c134bc7e..b108f4a5c7dd33aef5d20d9e5a5074a31ac8514e 100644 (file)
--- a/drivers/s390/cio/io_sch.h
+++ b/drivers/s390/cio/io_sch.h
@@ -126,6 +126,10 @@ struct ccw_device_private {
        u8 pgid_valid_mask;     /* mask of valid PGIDs */
        u8 pgid_todo_mask;      /* mask of PGIDs to be adjusted */
        u8 pgid_reset_mask;     /* mask of PGIDs which were reset */
+       u8 path_noirq_mask;     /* mask of paths for which no irq was
+                                  received */
+       u8 path_notoper_mask;   /* mask of paths which were found
+                                  not operable */
        u8 path_gone_mask;      /* mask of paths, that became unavailable */
        u8 path_new_mask;       /* mask of paths, that became available */
        struct {
@@ -145,6 +149,7 @@ struct ccw_device_private {
                unsigned int resuming:1;    /* recognition while resume */
                unsigned int pgroup:1;      /* pathgroup is set up */
                unsigned int mpath:1;       /* multipathing is set up */
+               unsigned int pgid_unknown:1;/* unknown pgid state */
                unsigned int initialized:1; /* set if initial reference held */
        } __attribute__((packed)) flags;
        unsigned long intparm;  /* user interruption parameter */