diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-12-16 12:25:38 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-12-16 12:25:38 +0100 |
| commit | 8ab7913675726e5ae23b91221c0b5442d986d44a (patch) | |
| tree | f2673dcb25e864cc87abe3f2d58db9bf9730f148 /drivers/s390/scsi/zfcp_def.h | |
| parent | 864b94adfcba752aa902ee34497bbe58b97aa8d3 (diff) | |
| parent | 3a5dc1fafb016560315fe45bb4ef8bde259dd1bc (diff) | |
| download | linux-8ab7913675726e5ae23b91221c0b5442d986d44a.tar.gz linux-8ab7913675726e5ae23b91221c0b5442d986d44a.tar.bz2 linux-8ab7913675726e5ae23b91221c0b5442d986d44a.zip | |
Merge branch 'x86/vt-d' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into x86/apic-picks
Required to apply Jiangs x86 irq handling rework without creating a
nightmare of conflicts.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/s390/scsi/zfcp_def.h')
| -rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index d91173f326c5..b8e853e53546 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h @@ -186,12 +186,13 @@ struct zfcp_adapter { struct fc_host_statistics *fc_stats; struct fsf_qtcb_bottom_port *stats_reset_data; unsigned long stats_reset; - struct work_struct scan_work; + struct delayed_work scan_work; struct work_struct ns_up_work; struct service_level service_level; struct workqueue_struct *work_queue; struct device_dma_parameters dma_parms; struct zfcp_fc_events events; + unsigned long next_port_scan; }; struct zfcp_port { |