include/linux/memory.h: drop fields 'hw' and 'phys_callback' from struct memory_block

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

diff --git a/include/linux/memory.h b/include/linux/memory.h
index 4c75dae..0b8d791 100644 (file)
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -29,8 +29,6 @@ struct memory_block {
        int section_count;              /* serialized by mem_sysfs_mutex */
        int online_type;                /* for passing data to online routine */
        int phys_device;                /* to which fru does this belong? */
-       void *hw;                       /* optional pointer to fw/hw data */
-       int (*phys_callback)(struct memory_block *);
        struct device dev;
        int nid;                        /* NID for this memory block */
 };
@@ -55,19 +53,6 @@ struct memory_notify {
        int status_change_nid;
 };
 
-/*
- * During pageblock isolation, count the number of pages within the
- * range [start_pfn, start_pfn + nr_pages) which are owned by code
- * in the notifier chain.
- */
-#define MEM_ISOLATE_COUNT      (1<<0)
-
-struct memory_isolate_notify {
-       unsigned long start_pfn;        /* Start of range to check */
-       unsigned int nr_pages;          /* # pages in range to check */
-       unsigned int pages_found;       /* # pages owned found by callbacks */
-};
-
 struct notifier_block;
 struct mem_section;
 
@@ -94,27 +79,13 @@ static inline int memory_notify(unsigned long val, void *v)
 {
        return 0;
 }
-static inline int register_memory_isolate_notifier(struct notifier_block *nb)
-{
-       return 0;
-}
-static inline void unregister_memory_isolate_notifier(struct notifier_block *nb)
-{
-}
-static inline int memory_isolate_notify(unsigned long val, void *v)
-{
-       return 0;
-}
 #else
 extern int register_memory_notifier(struct notifier_block *nb);
 extern void unregister_memory_notifier(struct notifier_block *nb);
-extern int register_memory_isolate_notifier(struct notifier_block *nb);
-extern void unregister_memory_isolate_notifier(struct notifier_block *nb);
 int create_memory_block_devices(unsigned long start, unsigned long size);
 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);
-extern int memory_isolate_notify(unsigned long val, void *v);
 extern struct memory_block *find_memory_block(struct mem_section *);
 typedef int (*walk_memory_blocks_func_t)(struct memory_block *, void *);
 extern int walk_memory_blocks(unsigned long start, unsigned long size,