From d55dfaa14a1b59245ac7575696fcd7c42d994959 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olh@suse.de>
Date: Sun, 8 Jan 2006 01:00:32 -0800
Subject: [PATCH] --- yaml --- r: 16823 b: refs/heads/master c:
 b792de39d892e06b18ddea85be076bae123d6bf6 h: refs/heads/master i:   16821:
 a8bec90b4e2f36ecd4c9e30a654a1b19903ac964   16819:
 0b8ccc9475e8a71d398dfded1fb67d5910694e9f   16815:
 f6cf0c28a10f4d5f04f59c6b59a6b7dc23edd2e1 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/memory.h | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 79f40529c763..f1d8ed48f450 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dab06fa7b6d07ee95c8bba5ddd0840633069159
+refs/heads/master: b792de39d892e06b18ddea85be076bae123d6bf6
diff --git a/trunk/include/linux/memory.h b/trunk/include/linux/memory.h
index dc4081b6f161..e251dc43d0f5 100644
--- a/trunk/include/linux/memory.h
+++ b/trunk/include/linux/memory.h
@@ -70,21 +70,15 @@ static inline void unregister_memory_notifier(struct notifier_block *nb)
 {
 }
 #else
-extern int register_memory(struct memory_block *, struct mem_section *section, struct node *);
 extern int register_new_memory(struct mem_section *);
 extern int unregister_memory_section(struct mem_section *);
 extern int memory_dev_init(void);
-extern int register_memory_notifier(struct notifier_block *nb);
-extern void unregister_memory_notifier(struct notifier_block *nb);
+extern int remove_memory_block(unsigned long, struct mem_section *, int);
 
 #define CONFIG_MEM_BLOCK_SIZE	(PAGES_PER_SECTION<<PAGE_SHIFT)
 
-extern int invalidate_phys_mapping(unsigned long, unsigned long);
 struct notifier_block;
 
-extern int register_memory_notifier(struct notifier_block *nb);
-extern void unregister_memory_notifier(struct notifier_block *nb);
-
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
 #define hotplug_memory_notifier(fn, pri) {			\