diff --git a/[refs] b/[refs] index 6234d87809bb..0d0f981de1be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3a307f32ec3554739033762672e533e2d246dae +refs/heads/master: 02d0e6753d8ab0173b63338157929e52eac86d12 diff --git a/trunk/include/linux/memory.h b/trunk/include/linux/memory.h index 2f5f8a5ef2a0..36c82c9e6ea7 100644 --- a/trunk/include/linux/memory.h +++ b/trunk/include/linux/memory.h @@ -91,7 +91,7 @@ extern int memory_notify(unsigned long val, void *v); #ifdef CONFIG_MEMORY_HOTPLUG #define hotplug_memory_notifier(fn, pri) { \ - static struct notifier_block fn##_mem_nb = \ + static __meminitdata struct notifier_block fn##_mem_nb =\ { .notifier_call = fn, .priority = pri }; \ register_memory_notifier(&fn##_mem_nb); \ }