X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fs390%2Fcio%2Fcss.h;h=8ab01af597b1f0821f05b8001c9012ca15983e00;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=b834e6a72464b0c0372e76169454b3da2c295674;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index b834e6a72..8ab01af59 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -66,6 +66,7 @@ struct senseid {
 struct ccw_device_private {
 	int state;		/* device state */
 	atomic_t onoff;
+	unsigned long registered;
 	__u16 devno;		/* device number */
 	__u16 irq;		/* subchannel number */
 	__u8 imask;		/* lpm mask for SNID/SID/SPGID */
@@ -137,6 +138,9 @@ void device_trigger_reprobe(struct subchannel *);
 /* Helper functions for vary on/off. */
 void device_set_waiting(struct subchannel *);
 
+/* Machine check helper function. */
+void device_kill_pending_timer(struct subchannel *);
+
 /* Helper functions to build lists for the slow path. */
 int css_enqueue_subchannel_slow(unsigned long schid);
 void css_walk_subchannel_slow_list(void (*fn)(unsigned long));