| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1333040821-6253-14-git-send-email-mchehab@redhat.com> Date: Thu, 29 Mar 2012 14:07:00 -0300 From: Mauro Carvalho Chehab <mchehab@...hat.com> To: unlisted-recipients:; (no To-header on input) Cc: Mauro Carvalho Chehab <mchehab@...hat.com>, Linux Edac Mailing List <linux-edac@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org> Subject: [PATCH 13/14] i7300_edac: Get rid of some wrongly-solved rebase conflict Drivers should not increment tot_dimms manually. This code were there for an older approach that got removed. After one of the several rebases that this code suffered until the final version, the conflict was wrongly merged, and this code returned. Signed-off-by: Mauro Carvalho Chehab <mchehab@...hat.com> --- drivers/edac/i7300_edac.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c index 57f264d..f9a4fa4 100644 --- a/drivers/edac/i7300_edac.c +++ b/drivers/edac/i7300_edac.c @@ -803,9 +803,6 @@ static int i7300_init_csrows(struct mem_ctl_info *mci) mtr = decode_mtr(pvt, slot, ch, branch, dinfo, dimm); - mci->tot_dimms++; - dimm++; - /* if no DIMMS on this row, continue */ if (!MTR_DIMMS_PRESENT(mtr)) continue; -- 1.7.8 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists