Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / include / linux / memory.h

diff --git a/include/linux/memory.h b/include/linux/memory.h
index 4da95e6..97e92e8 100644 (file)
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -29,6 +29,11 @@ struct memory_block {
        int online_type;                /* for passing data to online routine */
        int nid;                        /* NID for this memory block */
        struct device dev;
+       /*
+        * Number of vmemmap pages. These pages
+        * lay at the beginning of the memory block.
+        */
+       unsigned long nr_vmemmap_pages;
 };
 
 int arch_get_memory_phys_device(unsigned long start_pfn);
@@ -80,7 +85,8 @@ static inline int memory_notify(unsigned long val, void *v)
 #else
 extern int register_memory_notifier(struct notifier_block *nb);
 extern void unregister_memory_notifier(struct notifier_block *nb);
-int create_memory_block_devices(unsigned long start, unsigned long size);
+int create_memory_block_devices(unsigned long start, unsigned long size,
+                               unsigned long vmemmap_pages);
 void remove_memory_block_devices(unsigned long start, unsigned long size);
 extern void memory_dev_init(void);
 extern int memory_notify(unsigned long val, void *v);