diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-04-11 21:54:40 +0300 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-04-11 21:54:40 +0300 |
| commit | f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04 (patch) | |
| tree | f73da1077b7053b24a9af2d8e34b6180d5d5217e /drivers/scsi/hpsa.h | |
| parent | 28d06353881939703c34d82a1465136af176c620 (diff) | |
| parent | 47a4693e1d3eb09e523c223753fb5a97721f49b8 (diff) | |
| download | linux-f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04.tar.xz | |
Merge tag 'kvm-s390-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
From: Christian Borntraeger <borntraeger@de.ibm.com>
KVM: s390: features for 4.12
1. guarded storage support for guests
This contains an s390 base Linux feature branch that is necessary
to implement the KVM part
2. Provide an interface to implement adapter interruption suppression
which is necessary for proper zPCI support
3. Use more defines instead of numbers
4. Provide logging for lazy enablement of runtime instrumentation
Diffstat (limited to 'drivers/scsi/hpsa.h')
| -rw-r--r-- | drivers/scsi/hpsa.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h index bf6cdc106654..6f04f2ad4125 100644 --- a/drivers/scsi/hpsa.h +++ b/drivers/scsi/hpsa.h @@ -201,6 +201,7 @@ struct ctlr_info { dma_addr_t errinfo_pool_dhandle; unsigned long *cmd_pool_bits; int scan_finished; + u8 scan_waiting : 1; spinlock_t scan_lock; wait_queue_head_t scan_wait_queue; |