Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752960AbaBJV7h (ORCPT ); Mon, 10 Feb 2014 16:59:37 -0500 Received: from smtp.codeaurora.org ([198.145.11.231]:54112 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752702AbaBJV7e (ORCPT ); Mon, 10 Feb 2014 16:59:34 -0500 Message-ID: <52F94BC3.1060307@codeaurora.org> Date: Mon, 10 Feb 2014 13:59:31 -0800 From: Laura Abbott User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Courtney Cavin CC: Nicolas Pitre , Andrew Lunn , Kukjin Kim , Russell King , Jason Cooper , Ard Biesheuvel , Eric Miao , Will Deacon , "linux-kernel@vger.kernel.org" , Haojian Zhuang , Santosh Shilimkar , Grygorii Strashko , Leif Lindholm , Ben Dooks , "linux-arm-msm@vger.kernel.org" , Daniel Walker , David Brown , Catalin Marinas , "linux-arm-kernel@lists.infradead.org" , Sebastian Hesselbarth Subject: Re: [PATCHv2 2/2] arm: Get rid of meminfo References: <1391558551-31395-1-git-send-email-lauraa@codeaurora.org> <1391558551-31395-3-git-send-email-lauraa@codeaurora.org> <20140207020949.GQ1706@sonymobile.com> <52F846AE.3050800@codeaurora.org> <20140210172808.GS1706@sonymobile.com> In-Reply-To: <20140210172808.GS1706@sonymobile.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/10/2014 9:28 AM, Courtney Cavin wrote: > On Mon, Feb 10, 2014 at 04:25:34AM +0100, Laura Abbott wrote: >> On 2/6/2014 6:09 PM, Courtney Cavin wrote: >>> 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() ? >> Yes, that was a typo on my part. I'll send out a v3 with collected acks. >> > > So, I also just noticed that you specifically remove the call to > sharpsl_save_param() here. I'm presuming that this is also an error, as > you haven't removed it from any of the other pxa fixups, and it seems > unrelated to the change. > > -Courtney Clearly not my finest hour at all. Thanks for reviewing. Laura -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/