From 85fa15e8397053e71c84a258068bbd9029dc76cd Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 26 Jan 2010 16:31:19 -0800
Subject: [PATCH] --- yaml --- r: 182559 b: refs/heads/master c:
 e52730071567ec5b6f57e21d6693b112e01e1d0e h: refs/heads/master i:   182557:
 df0e9c08e1e72dce84331bccd0212186bbe9f1e3   182555:
 81b8fc3450ff61b1892aad9637277e99c18b056c   182551:
 01f2fa7c320a163ce1fbb587767f02d018702d80   182543:
 041cff84552c3d3724957f6e0e9f11ca695b0098   182527:
 b993e02ac869b3f571800dcda21c5c8495891ba1 v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/resource.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 }