On 02/01/2010 05:24 PM, Andrew Morton wrote:
>>
>> diff --git a/kernel/resource.c b/kernel/resource.c
>> index b4d637a..e68cd74 100644
>> --- a/kernel/resource.c
>> +++ b/kernel/resource.c
>> @@ -305,7 +305,7 @@ static int __is_ram(unsigned long pfn, unsigned long nr_pages, void *arg)
>> * This generic page_is_ram() returns true if specified address is
>> * registered as "System RAM" in iomem_resource list.
>> */
>> -int __attribute__((weak)) page_is_ram(unsigned long pfn)
>> +int __weak page_is_ram(unsigned long pfn)
>> {
>> return walk_system_ram_range(pfn, 1, NULL, __is_ram) == 1;
>> }
>
> hm, it's strange to do this as two separate commits?
>
You had it as a separate fix patch, and I generally don't want to fold
patches which have different authorship, especially if the original code
doesn't actually break anything.
> There was another fixlet:
>
> From: Wu Fengguang <fengguang.wu@xxxxxxxxx>
>
> ioport.h didn't seem like the right place to declare page_is_ram().
>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Yes, I have that one too.
-hpa
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|