Merge branch 'master' into tk71

[mv-sheeva.git] / include / linux / memory.h

diff --git a/include/linux/memory.h b/include/linux/memory.h
index 85582e1bcee900bd219c60169a708a2a38dca8e1..06c1fa0a5c7b5a4fb908a01f59699e5d1f1d77cc 100644 (file)
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -23,6 +23,8 @@
 struct memory_block {
        unsigned long phys_index;
        unsigned long state;
+       int section_count;
+
        /*
         * This serializes all state change requests.  It isn't
         * held during creation because the control files are
@@ -113,6 +115,8 @@ extern int memory_dev_init(void);
 extern int remove_memory_block(unsigned long, struct mem_section *, int);
 extern int memory_notify(unsigned long val, void *v);
 extern int memory_isolate_notify(unsigned long val, void *v);
+extern struct memory_block *find_memory_block_hinted(struct mem_section *,
+                                                       struct memory_block *);
 extern struct memory_block *find_memory_block(struct mem_section *);
 #define CONFIG_MEM_BLOCK_SIZE  (PAGES_PER_SECTION<<PAGE_SHIFT)
 enum mem_add_context { BOOT, HOTPLUG };