The patch titled
gfp_thisnode-for-the-slab-allocator-v2-fix
has been removed from the -mm tree. Its filename is
gfp_thisnode-for-the-slab-allocator-v2-fix.patch
This patch was dropped because it was folded into gfp_thisnode-for-the-slab-allocator-v2.patch
------------------------------------------------------
Subject: gfp_thisnode-for-the-slab-allocator-v2-fix
From: Andrew Morton <akpm@xxxxxxxx>
mm/slab.c: In function '__cache_alloc':
mm/slab.c:3064: warning: implicit declaration of function 'alternate_node_alloc'
mm/slab.c:3064: warning: assignment makes pointer from integer without a cast
mm/slab.c:3073: warning: implicit declaration of function '__cache_alloc_node'
mm/slab.c:3073: warning: assignment makes pointer from integer without a cast
mm/slab.c: At top level:
mm/slab.c:3194: error: conflicting types for '__cache_alloc_node'
mm/slab.c:3073: error: previous implicit declaration of '__cache_alloc_node' was here
mm/slab.c:3200: error: conflicting types for 'alternate_node_alloc'
mm/slab.c:3064: error: previous implicit declaration of 'alternate_node_alloc' was here
Cc: Christoph Lameter <clameter@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/slab.c | 66 ++++++++++++++++++++++++++--------------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff -puN mm/slab.c~gfp_thisnode-for-the-slab-allocator-v2-fix mm/slab.c
--- a/mm/slab.c~gfp_thisnode-for-the-slab-allocator-v2-fix
+++ a/mm/slab.c
@@ -972,7 +972,39 @@ static int transfer_objects(struct array
return nr;
}
-#ifdef CONFIG_NUMA
+#ifndef CONFIG_NUMA
+
+#define drain_alien_cache(cachep, alien) do { } while (0)
+#define reap_alien(cachep, l3) do { } while (0)
+
+static inline struct array_cache **alloc_alien_cache(int node, int limit)
+{
+ return (struct array_cache **)BAD_ALIEN_MAGIC;
+}
+
+static inline void free_alien_cache(struct array_cache **ac_ptr)
+{
+}
+
+static inline int cache_free_alien(struct kmem_cache *cachep, void *objp)
+{
+ return 0;
+}
+
+static inline void *alternate_node_alloc(struct kmem_cache *cachep,
+ gfp_t flags)
+{
+ return NULL;
+}
+
+static inline void *__cache_alloc_node(struct kmem_cache *cachep,
+ gfp_t flags, int nodeid)
+{
+ return NULL;
+}
+
+#else /* CONFIG_NUMA */
+
static void *__cache_alloc_node(struct kmem_cache *, gfp_t, int);
static void *alternate_node_alloc(struct kmem_cache *, gfp_t);
@@ -1101,26 +1133,6 @@ static inline int cache_free_alien(struc
}
return 1;
}
-
-#else
-
-#define drain_alien_cache(cachep, alien) do { } while (0)
-#define reap_alien(cachep, l3) do { } while (0)
-
-static inline struct array_cache **alloc_alien_cache(int node, int limit)
-{
- return (struct array_cache **)BAD_ALIEN_MAGIC;
-}
-
-static inline void free_alien_cache(struct array_cache **ac_ptr)
-{
-}
-
-static inline int cache_free_alien(struct kmem_cache *cachep, void *objp)
-{
- return 0;
-}
-
#endif
static int __cpuinit cpuup_callback(struct notifier_block *nfb,
@@ -3188,18 +3200,6 @@ must_grow:
done:
return obj;
}
-#else
-static inline void *__cache_alloc_node(struct kmem_cache *cachep,
- gfp_t flags, int nodeid)
-{
- return NULL;
-}
-
-static inline void *alternate_node_alloc(struct kmem_cache *cachep,
- gfp_t flags)
-{
- return NULL;
-}
#endif
/*
_
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
gfp_thisnode-for-the-slab-allocator-v2.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
