diff options
| author | Nagalakshmi Nandigama <nagalakshmi.nandigama@lsi.com> | 2012-01-04 09:25:13 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 14:14:00 -0800 |
| commit | fca54d03a85e883b813255c63bbf11049d2eeb7a (patch) | |
| tree | 0c0823266d4d229d34acead093b4b52acec234ac /drivers/scsi/mpt2sas/mpt2sas_base.h | |
| parent | 7204bf5ef7295b6041047d581153990164b58988 (diff) | |
| download | kernel_samsung_smdk4412-fca54d03a85e883b813255c63bbf11049d2eeb7a.zip kernel_samsung_smdk4412-fca54d03a85e883b813255c63bbf11049d2eeb7a.tar.gz kernel_samsung_smdk4412-fca54d03a85e883b813255c63bbf11049d2eeb7a.tar.bz2 | |
mpt2sas: fix non-x86 crash on shutdown
Upstrem commit: 911ae9434f83e7355d343f6c2be3ef5b00ea7aed
There's a bug in the MSIX backup and restore routines that cause a crash on
non-x86 (direct access to PCI space not via read/write). These routines are
unnecessary and were removed by the above commit, so also remove them from
stable to fix the crash.
Signed-off-by: Nagalakshmi Nandigama <nagalakshmi.nandigama@lsi.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_base.h')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h index 41a57a7..e1735f9 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.h +++ b/drivers/scsi/mpt2sas/mpt2sas_base.h @@ -626,8 +626,6 @@ struct mpt2sas_port_facts { * @wait_for_port_enable_to_complete: * @msix_enable: flag indicating msix is enabled * @msix_vector_count: number msix vectors - * @msix_table: virt address to the msix table - * @msix_table_backup: backup msix table * @scsi_io_cb_idx: shost generated commands * @tm_cb_idx: task management commands * @scsih_cb_idx: scsih internal commands @@ -768,8 +766,6 @@ struct MPT2SAS_ADAPTER { u8 msix_enable; u16 msix_vector_count; - u32 *msix_table; - u32 *msix_table_backup; u32 ioc_reset_count; /* internal commands, callback index */ |