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/mpc85xx_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/mpc85xx_edac.c')
-rw-r--r-- | drivers/edac/mpc85xx_edac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index d132dbbd9bd7..0db6f1e84656 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c | |||
@@ -825,7 +825,7 @@ static void mpc85xx_mc_check(struct mem_ctl_info *mci) | |||
825 | pfn = err_addr >> PAGE_SHIFT; | 825 | pfn = err_addr >> PAGE_SHIFT; |
826 | 826 | ||
827 | for (row_index = 0; row_index < mci->nr_csrows; row_index++) { | 827 | for (row_index = 0; row_index < mci->nr_csrows; row_index++) { |
828 | csrow = &mci->csrows[row_index]; | 828 | csrow = mci->csrows[row_index]; |
829 | if ((pfn >= csrow->first_page) && (pfn <= csrow->last_page)) | 829 | if ((pfn >= csrow->first_page) && (pfn <= csrow->last_page)) |
830 | break; | 830 | break; |
831 | } | 831 | } |
@@ -945,8 +945,8 @@ static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci) | |||
945 | u32 start; | 945 | u32 start; |
946 | u32 end; | 946 | u32 end; |
947 | 947 | ||
948 | csrow = &mci->csrows[index]; | 948 | csrow = mci->csrows[index]; |
949 | dimm = csrow->channels[0].dimm; | 949 | dimm = csrow->channels[0]->dimm; |
950 | 950 | ||
951 | cs_bnds = in_be32(pdata->mc_vbase + MPC85XX_MC_CS_BNDS_0 + | 951 | cs_bnds = in_be32(pdata->mc_vbase + MPC85XX_MC_CS_BNDS_0 + |
952 | (index * MPC85XX_MC_CS_BNDS_OFS)); | 952 | (index * MPC85XX_MC_CS_BNDS_OFS)); |