Re: linux-next: build warning after merge of the slab tree

[Christoph Lameter <cl@linux.com>]

On Mon, 14 Mar 2011, Stephen Rothwell wrote:

> mm/slub.c: In function 'slab_free':
> mm/slub.c:2124: warning: label 'redo' defined but not used
>
> Introduced by commit 8a5ec0ba42c4 ("Lockless (and preemptless) fastpaths
> for slub").
---

Subject: slub: Dont define useless label in the !CONFIG_CMPXCHG_LOCAL case

The redo label needs #ifdeffery.

Signed-off-by: Christoph Lameter <cl@linux.com>

 mm/slub.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux-next/mm/slub.c
===================================================================
--- linux-next.orig/mm/slub.c	2011-03-15 12:41:41.000000000 -0500
+++ linux-next/mm/slub.c	2011-03-15 12:43:06.000000000 -0500
@@ -2119,9 +2119,11 @@ static __always_inline void slab_free(st

 #ifndef CONFIG_CMPXCHG_LOCAL
 	local_irq_save(flags);
-#endif

+#else
 redo:
+#endif
+
 	/*
 	 * Determine the currently cpus per cpu slab.
 	 * The cpu may change afterward. However that does not matter since