diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-24 14:05:43 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-11 12:23:45 -0400 |
commit | de3910eb79ac8c0f29a11224661c0ebaaf813039 (patch) | |
tree | 44584d6691588b2c18823260be0e44f0c9872d02 /drivers/edac/i82875p_edac.c | |
parent | e39f4ea9b01f137f9e6fa631f3e9088fb9175e91 (diff) |
edac: change the mem allocation scheme to make Documentation/kobject.txt happy
Kernel kobjects have rigid rules: each container object should be
dynamically allocated, and can't be allocated into a single kmalloc.
EDAC never obeyed this rule: it has a single malloc function that
allocates all needed data into a single kzalloc.
As this is not accepted anymore, change the allocation schema of the
EDAC *_info structs to enforce this Kernel standard.
Acked-by: Chris Metcalf <cmetcalf@tilera.com>
Cc: Aristeu Rozanski <arozansk@redhat.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Cc: Greg K H <gregkh@linuxfoundation.org>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Cc: Mark Gross <mark.gross@intel.com>
Cc: Tim Small <tim@buttersideup.com>
Cc: Ranganathan Desikan <ravi@jetztechnologies.com>
Cc: "Arvind R." <arvino55@gmail.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Egor Martovetsky <egor@pasemi.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Hitoshi Mitake <h.mitake@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Shaohui Xie <Shaohui.Xie@freescale.com>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/edac/i82875p_edac.c')
-rw-r--r-- | drivers/edac/i82875p_edac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c index a47c6b25db31..97fd6b769c84 100644 --- a/drivers/edac/i82875p_edac.c +++ b/drivers/edac/i82875p_edac.c | |||
@@ -227,7 +227,7 @@ static int i82875p_process_error_info(struct mem_ctl_info *mci, | |||
227 | { | 227 | { |
228 | int row, multi_chan; | 228 | int row, multi_chan; |
229 | 229 | ||
230 | multi_chan = mci->csrows[0].nr_channels - 1; | 230 | multi_chan = mci->csrows[0]->nr_channels - 1; |
231 | 231 | ||
232 | if (!(info->errsts & 0x0081)) | 232 | if (!(info->errsts & 0x0081)) |
233 | return 0; | 233 | return 0; |
@@ -367,7 +367,7 @@ static void i82875p_init_csrows(struct mem_ctl_info *mci, | |||
367 | */ | 367 | */ |
368 | 368 | ||
369 | for (index = 0; index < mci->nr_csrows; index++) { | 369 | for (index = 0; index < mci->nr_csrows; index++) { |
370 | csrow = &mci->csrows[index]; | 370 | csrow = mci->csrows[index]; |
371 | 371 | ||
372 | value = readb(ovrfl_window + I82875P_DRB + index); | 372 | value = readb(ovrfl_window + I82875P_DRB + index); |
373 | cumul_size = value << (I82875P_DRB_SHIFT - PAGE_SHIFT); | 373 | cumul_size = value << (I82875P_DRB_SHIFT - PAGE_SHIFT); |
@@ -382,7 +382,7 @@ static void i82875p_init_csrows(struct mem_ctl_info *mci, | |||
382 | last_cumul_size = cumul_size; | 382 | last_cumul_size = cumul_size; |
383 | 383 | ||
384 | for (j = 0; j < nr_chans; j++) { | 384 | for (j = 0; j < nr_chans; j++) { |
385 | dimm = csrow->channels[j].dimm; | 385 | dimm = csrow->channels[j]->dimm; |
386 | 386 | ||
387 | dimm->nr_pages = nr_pages / nr_chans; | 387 | dimm->nr_pages = nr_pages / nr_chans; |
388 | dimm->grain = 1 << 12; /* I82875P_EAP has 4KiB reolution */ | 388 | dimm->grain = 1 << 12; /* I82875P_EAP has 4KiB reolution */ |