From mboxrd@z Thu Jan 1 00:00:00 1970 From: courtney.cavin@sonymobile.com (Courtney Cavin) Date: Thu, 6 Feb 2014 18:09:50 -0800 Subject: [PATCHv2 2/2] arm: Get rid of meminfo In-Reply-To: <1391558551-31395-3-git-send-email-lauraa@codeaurora.org> References: <1391558551-31395-1-git-send-email-lauraa@codeaurora.org> <1391558551-31395-3-git-send-email-lauraa@codeaurora.org> Message-ID: <20140207020949.GQ1706@sonymobile.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Feb 05, 2014 at 01:02:31AM +0100, Laura Abbott wrote: > memblock is now fully integrated into the kernel and is the prefered > method for tracking memory. Rather than reinvent the wheel with > meminfo, migrate to using memblock directly instead of meminfo as > an intermediate. > > Signed-off-by: Laura Abbott [...] > diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c > index 0b11c1a..51d814e 100644 > --- a/arch/arm/mach-pxa/spitz.c > +++ b/arch/arm/mach-pxa/spitz.c > @@ -32,6 +32,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -971,13 +972,9 @@ static void __init spitz_init(void) > spitz_i2c_init(); > } > > -static void __init spitz_fixup(struct tag *tags, char **cmdline, > - struct meminfo *mi) > +static void __init spitz_fixup(struct tag *tags, char **cmdline) > { > - sharpsl_save_param(); > - mi->nr_banks = 1; > - mi->bank[0].start = 0xa0000000; > - mi->bank[0].size = (64*1024*1024); > + memblock_addr(0xa0000000, SZ_64M); memblock_add() ? -Courtney