From 0ddc5f272e44be5f44395b1b23032224896dcbad Mon Sep 17 00:00:00 2001 From: Steve Hodgson Date: Wed, 28 Apr 2010 09:28:52 +0000 Subject: [PATCH] --- yaml --- r: 194593 b: refs/heads/master c: 97e1eaa0e943439208a692b00dce4a8a3006760f h: refs/heads/master i: 194591: f29f78fe7442e4e339ffca4d987b50221115ee3c v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/nic.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e24d22bd6547..405d4386e0af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b548a988a9d08f2b06f6810b1a4cde6f632bd307 +refs/heads/master: 97e1eaa0e943439208a692b00dce4a8a3006760f diff --git a/trunk/drivers/net/sfc/nic.c b/trunk/drivers/net/sfc/nic.c index b61674cb0c19..4105f9099c7c 100644 --- a/trunk/drivers/net/sfc/nic.c +++ b/trunk/drivers/net/sfc/nic.c @@ -1287,7 +1287,8 @@ irqreturn_t efx_nic_fatal_interrupt(struct efx_nic *efx) error ? "disabling bus mastering" : "no recognised error"); /* If this is a memory parity error dump which blocks are offending */ - mem_perr = EFX_OWORD_FIELD(fatal_intr, FRF_AZ_MEM_PERR_INT_KER); + mem_perr = (EFX_OWORD_FIELD(fatal_intr, FRF_AZ_MEM_PERR_INT_KER) || + EFX_OWORD_FIELD(fatal_intr, FRF_AZ_SRM_PERR_INT_KER)); if (mem_perr) { efx_oword_t reg; efx_reado(efx, ®, FR_AZ_MEM_STAT);