The patch titled
slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id-fix
has been removed from the -mm tree. Its filename is
slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id-fix.patch
This patch was dropped because it was folded into slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id.patch
------------------------------------------------------
Subject: slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id-fix
From: Andrew Morton <akpm@xxxxxxxx>
mm/slab.c: In function '__cache_alloc':
mm/slab.c:3065: warning: label 'out' defined but not used
mutter.
Cc: Christoph Lameter <clameter@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/slab.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff -puN mm/slab.c~slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id-fix mm/slab.c
--- a/mm/slab.c~slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id-fix
+++ a/mm/slab.c
@@ -3047,22 +3047,19 @@ static __always_inline void *__cache_all
gfp_t flags, void *caller)
{
unsigned long save_flags;
- void *objp;
+ void *objp = NULL;
cache_alloc_debugcheck_before(cachep, flags);
local_irq_save(save_flags);
#ifdef CONFIG_NUMA
- if (unlikely(current->flags & (PF_SPREAD_SLAB | PF_MEMPOLICY))) {
+ if (unlikely(current->flags & (PF_SPREAD_SLAB | PF_MEMPOLICY)))
objp = alternate_node_alloc(cachep, flags);
- if (objp != NULL)
- goto out;
- }
#endif
- objp = ____cache_alloc(cachep, flags);
-out:
+ if (!objp)
+ objp = ____cache_alloc(cachep, flags);
local_irq_restore(save_flags);
objp = cache_alloc_debugcheck_after(cachep, flags, objp,
caller);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
revert-x86_64-mm-i386-remove-lock-section.patch
fix-x86_64-mm-spinlock-cleanup.patch
have-x86-use-add_active_range-and-free_area_init_nodes.patch
vm-add-per-zone-writeout-counter.patch
slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id.patch
slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id-fix.patch
gfp_thisnode-for-the-slab-allocator-v2-fix.patch
do_no_pfn-tweaks.patch
nommu-set-bdi-capabilities-for-dev-mem-and-dev-kmem-tidy.patch
nommu-move-the-fallback-arch_vma_name-to-a-sensible-place-fix.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix-fix.patch
x86-microcode-microcode-driver-cleanup-tidy.patch
x86-microcode-add-sysfs-and-hotplug-support-fix.patch
eisa-bus-modalias-attributes-support-1-fix-git-kbuild-fix.patch
add-address_space_operationsbatch_write-fix.patch
alloc_fdtable-cleanup.patch
sysctl-allow-proc-sys-without-sys_sysctl-fix.patch
add-probe_kernel_address.patch
x86-use-probe_kernel_address-in-handle_bug.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
