From a86f898c8fd673115bbd13d5a5760ae1658b59c0 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 23 Jul 2012 10:46:11 -0700 Subject: [PATCH] --- yaml --- r: 322347 b: refs/heads/master c: 4b1c2f41c2dda158bb7a3dded70775a76b581995 h: refs/heads/master i: 322345: a0f358ed63f59f611158e2b057dbbbafc4a161bc 322343: ca49cc49e6d113ebca3148b5e3a69155c2c84f71 v: v3 --- [refs] | 2 +- trunk/Documentation/watchdog/src/watchdog-test.c | 2 +- trunk/mm/slab.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c02a99db789..24b741dbd6a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51cd8e6ff265650e35e46b5bcbe2ee381a7a2877 +refs/heads/master: 4b1c2f41c2dda158bb7a3dded70775a76b581995 diff --git a/trunk/Documentation/watchdog/src/watchdog-test.c b/trunk/Documentation/watchdog/src/watchdog-test.c index 73ff5cc93e05..3da822967ee0 100644 --- a/trunk/Documentation/watchdog/src/watchdog-test.c +++ b/trunk/Documentation/watchdog/src/watchdog-test.c @@ -31,7 +31,7 @@ static void keep_alive(void) * or "-e" to enable the card. */ -void term(int sig) +static void term(int sig) { close(fd); fprintf(stderr, "Stopping watchdog ticks...\n"); diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 811af03a14ef..f8b0d539b482 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -3260,7 +3260,6 @@ static void *cache_alloc_refill(struct kmem_cache *cachep, gfp_t flags, /* cache_grow can reenable interrupts, then ac could change. */ ac = cpu_cache_get(cachep); - node = numa_mem_id(); /* no objects in sight? abort */ if (!x && (ac->avail == 0 || force_refill))