The patch titled
     
memory-hotplug-make-kmem_cache_node-for-slub-on-memory-online-avoid-panic-fix
has been added to the -mm tree.  Its filename is
     
memory-hotplug-make-kmem_cache_node-for-slub-on-memory-online-avoid-panic-fix.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: 
memory-hotplug-make-kmem_cache_node-for-slub-on-memory-online-avoid-panic-fix
From: Andrew Morton <[EMAIL PROTECTED]>

mm/slub.c: In function 'kmem_cache_init':
mm/slub.c:2835: error: 'slab_memory_callback' undeclared (first use in this 
function)
mm/slub.c:2835: error: (Each undeclared identifier is reported only once
mm/slub.c:2835: error: for each function it appears in.)

Cc: Yasunori Goto <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 include/linux/memory.h |    4 ++++
 1 file changed, 4 insertions(+)

diff -puN 
mm/slub.c~memory-hotplug-make-kmem_cache_node-for-slub-on-memory-online-avoid-panic-fix
 mm/slub.c
diff -puN 
include/linux/memory.h~memory-hotplug-make-kmem_cache_node-for-slub-on-memory-online-avoid-panic-fix
 include/linux/memory.h
--- 
a/include/linux/memory.h~memory-hotplug-make-kmem_cache_node-for-slub-on-memory-online-avoid-panic-fix
+++ a/include/linux/memory.h
@@ -83,10 +83,14 @@ extern int memory_notify(unsigned long v
 
 #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
 
+#ifdef CONFIG_MEMORY_HOTPLUG
 #define hotplug_memory_notifier(fn, pri) {                     \
        static struct notifier_block fn##_mem_nb =              \
                { .notifier_call = fn, .priority = pri };       \
        register_memory_notifier(&fn##_mem_nb);                 \
 }
+#else
+#define hotplug_memory_notifier(fn, pri) do { } while (0)
+#endif
 
 #endif /* _LINUX_MEMORY_H_ */
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
memory-hotplug-make-kmem_cache_node-for-slub-on-memory-online-avoid-panic.patch
memory-hotplug-make-kmem_cache_node-for-slub-on-memory-online-avoid-panic-fix.patch
capabilities-clean-up-file-capability-reading.patch
ext2-avoid-rec_len-overflow-with-64kb-block-size.patch
intel-iommu-pci-generic-helper-function.patch
intel-iommu-iova-allocation-and-management-routines.patch
intel-iommu-intel-iommu-driver.patch
intel-iommu-iommu-floppy-workaround.patch
kexec-add-bss-to-resource-tree.patch
kexec-introduce-bootmem_exclusive.patch
kexec-introduce-bootmem_exclusive-fix.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to