diff --git a/[refs] b/[refs] index 82c45765f6ce..e57e52dea820 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61ef2489dbf587258526cfd4ebf4bba3b079f401 +refs/heads/master: e52730071567ec5b6f57e21d6693b112e01e1d0e diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c index b4d637a55256..e68cd7477c40 100644 --- a/trunk/kernel/resource.c +++ b/trunk/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; }