From 1d693eddcaed1139bf07bbf8bdb36db8dc75e6b1 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 4 Aug 2010 13:52:25 +1000
Subject: [PATCH] --- yaml --- r: 212688 b: refs/heads/master c:
 1e2b904026e9debf95f500b8980a00c43ac0f31c h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/memblock.h | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index e4703de82adb..3a8a6594eec8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 719c1514f2fef5f01fcfa2bba81b7bb079c7c6a1
+refs/heads/master: 1e2b904026e9debf95f500b8980a00c43ac0f31c
diff --git a/trunk/include/linux/memblock.h b/trunk/include/linux/memblock.h
index c914112cd24f..7d70fdd43db4 100644
--- a/trunk/include/linux/memblock.h
+++ b/trunk/include/linux/memblock.h
@@ -64,29 +64,6 @@ extern int memblock_find(struct memblock_region *res);
 
 extern void memblock_dump_all(void);
 
-/* Obsolete accessors */
-static inline u64
-memblock_size_bytes(struct memblock_type *type, unsigned long region_nr)
-{
-	return type->regions[region_nr].size;
-}
-static inline u64
-memblock_size_pages(struct memblock_type *type, unsigned long region_nr)
-{
-	return memblock_size_bytes(type, region_nr) >> PAGE_SHIFT;
-}
-static inline u64
-memblock_start_pfn(struct memblock_type *type, unsigned long region_nr)
-{
-	return type->regions[region_nr].base >> PAGE_SHIFT;
-}
-static inline u64
-memblock_end_pfn(struct memblock_type *type, unsigned long region_nr)
-{
-	return memblock_start_pfn(type, region_nr) +
-	       memblock_size_pages(type, region_nr);
-}
-
 /*
  * pfn conversion functions
  *