---

yaml --- r: 322347 b: refs/heads/master c: 4b1c2f4 h: refs/heads/master i: 322345: a0f358e 322343: ca49cc4 v: v3
git-mirror · Aug 29, 2012 · a86f898 · a86f898
1 parent 12e2fb3
commit a86f898
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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))