drivers: base: use standard device online/offline for state change

[karo-tx-linux.git] / include / linux / memory.h

diff --git a/include/linux/memory.h b/include/linux/memory.h
index 85c31a8e290459c6f3d89fd517ccb2e6d748f095..9a6bbf76452d16a89d53485225901f7af80823c1 100644 (file)
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -25,16 +25,9 @@
 struct memory_block {
        unsigned long start_section_nr;
        unsigned long end_section_nr;
-       unsigned long state;
-       int section_count;
-
-       /*
-        * This serializes all state change requests.  It isn't
-        * held during creation because the control files are
-        * created long after the critical areas during
-        * initialization.
-        */
-       struct mutex state_mutex;
+       unsigned long state;            /* serialized by the dev->lock */
+       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 *);
@@ -125,7 +118,6 @@ 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 };
 #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
 
 #ifdef CONFIG_MEMORY_HOTPLUG