diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-24 13:34:40 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-24 13:34:40 -0500 |
| commit | 8bd142c01648cdb33e9bcafa0448ba2c20ed814c (patch) | |
| tree | 9197c60d3f9d4036f38f281a183e94750ceea1d7 /drivers/net/ethernet/sfc/efx.c | |
| parent | d792abacaf1a1a8dfea353fab699b97fa6251c2a (diff) | |
| parent | fbb4574ce9a37e15a9872860bf202f2be5bdf6c4 (diff) | |
Merge tag 'kvm-arm-for-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM Fixes for v4.4-rc3.
Includes some timer fixes, properly unmapping PTEs, an errata fix, and two
tweaks to the EL2 panic code.
Diffstat (limited to 'drivers/net/ethernet/sfc/efx.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index d288f1c928de..a3c42a376741 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c | |||
| @@ -3422,7 +3422,7 @@ out: | |||
| 3422 | * with our request for slot reset the mmio_enabled callback will never be | 3422 | * with our request for slot reset the mmio_enabled callback will never be |
| 3423 | * called, and the link_reset callback is not used by AER or EEH mechanisms. | 3423 | * called, and the link_reset callback is not used by AER or EEH mechanisms. |
| 3424 | */ | 3424 | */ |
| 3425 | static struct pci_error_handlers efx_err_handlers = { | 3425 | static const struct pci_error_handlers efx_err_handlers = { |
| 3426 | .error_detected = efx_io_error_detected, | 3426 | .error_detected = efx_io_error_detected, |
| 3427 | .slot_reset = efx_io_slot_reset, | 3427 | .slot_reset = efx_io_slot_reset, |
| 3428 | .resume = efx_io_resume, | 3428 | .resume = efx_io_resume, |