On Sat, 8 Sep 2012, Ezequiel Garcia wrote:

quoted

@@ -454,15 +455,35 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
                      gfp |= __GFP_COMP;
              ret = slob_new_pages(gfp, order, node);

-             trace_kmalloc_node(_RET_IP_, ret,
+             trace_kmalloc_node(caller, ret,
                                 size, PAGE_SIZE << order, gfp, node);
      }

      kmemleak_alloc(ret, size, 1, gfp);
      return ret;
 }
+
+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
+{
+     return __do_kmalloc_node(size, gfp, node, _RET_IP_);
+}
 EXPORT_SYMBOL(__kmalloc_node);

+#ifdef CONFIG_TRACING
+void *__kmalloc_track_caller(size_t size, gfp_t gfp, unsigned long caller)
+{
+     return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, caller);
+}
+
+#ifdef CONFIG_NUMA
+void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
+                                     int node, unsigned long caller)
+{
+     return __do_kmalloc_node(size, gfp, node, caller);
+}
+#endif

This breaks Pekka's slab/next tree with this:

mm/slob.c: In function '__kmalloc_node_track_caller':
mm/slob.c:488: error: 'gfp' undeclared (first use in this function)
mm/slob.c:488: error: (Each undeclared identifier is reported only once
mm/slob.c:488: error: for each function it appears in.)


mm, slob: fix build breakage in __kmalloc_node_track_caller

"mm, slob: Add support for kmalloc_track_caller()" breaks the build
because gfp is undeclared.  Fix it.

Signed-off-by: David Rientjes <rientjes@google.com>
---
 mm/slob.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/slob.c b/mm/slob.c
--- a/mm/slob.c
+++ b/mm/slob.c

@@ -482,7 +482,7 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfp, unsigned long caller)
 }

 #ifdef CONFIG_NUMA
-void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
+void *__kmalloc_node_track_caller(size_t size, gfp_t gfp,
                                        int node, unsigned long caller)
 {
        return __do_kmalloc_node(size, gfp, node, caller);