From 24409507973cd959f1dee8d7fa838d131384efca Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Tue, 25 Sep 2012 12:53:51 -0700 Subject: [PATCH] --- yaml --- r: 330451 b: refs/heads/master c: 82bd5508b4080e851ac1a9b62bed6d727b1b4a84 h: refs/heads/master i: 330449: a8ff7a444298aae4079fe8e2cac2ec54de1f7a8e 330447: e7ff0b62bb843b38f41265508766e7077c8bb3da v: v3 --- [refs] | 2 +- trunk/mm/slob.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0181f3de3bce..f5e55dc7e755 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e5965bf1f018cc30a4659fa3f1a40146e4276f6 +refs/heads/master: 82bd5508b4080e851ac1a9b62bed6d727b1b4a84 diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index dd47d16d57b6..8c00d22afc9e 100644 --- a/trunk/mm/slob.c +++ b/trunk/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);