From 9dd465691df068a06ec072f3af7157f2c3e7c399 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Fri, 13 Mar 2009 00:00:58 -0400
Subject: [PATCH] --- yaml --- r: 140943 b: refs/heads/master c:
 eb1871f34358024acfa3523ef375ef14b7527173 h: refs/heads/master i:   140941:
 328bad734e960a656e228427c39e633cb66bb750   140939:
 6b47c440ec5d7270b3d1e9df6aa1cfbdfae01d4a   140935:
 f00cafec26af45688c1ff034348c4a87f2e24811   140927:
 d9952022f0fe2fa436730a668f88344eaf543008 v: v3

---
 [refs]                           |  2 +-
 trunk/Makefile                   |  2 +-
 trunk/kernel/trace/trace_stack.c |  4 ++--
 trunk/lib/bitmap.c               | 16 ++++++++--------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 53cf203aa3f2..1fce4f4f72f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7afe16c2bbf065e30d692423ad2c7e77c4cfe9a5
+refs/heads/master: eb1871f34358024acfa3523ef375ef14b7527173
diff --git a/trunk/Makefile b/trunk/Makefile
index 46c04c546ee2..69b8091bfed1 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 29
-EXTRAVERSION = -rc8
+EXTRAVERSION = -rc7
 NAME = Erotic Pickled Herring
 
 # *DOCUMENTATION*
diff --git a/trunk/kernel/trace/trace_stack.c b/trunk/kernel/trace/trace_stack.c
index 91ccbf396c9a..c750f65f9661 100644
--- a/trunk/kernel/trace/trace_stack.c
+++ b/trunk/kernel/trace/trace_stack.c
@@ -262,9 +262,9 @@ static int t_show(struct seq_file *m, void *v)
 	int size;
 
 	if (v == SEQ_START_TOKEN) {
-		seq_printf(m, "        Depth    Size      Location"
+		seq_printf(m, "        Depth    Size   Location"
 			   "    (%d entries)\n"
-			   "        -----    ----      --------\n",
+			   "        -----    ----   --------\n",
 			   max_stack_trace.nr_entries);
 
 		if (!stack_tracer_enabled && !max_stack_size)
diff --git a/trunk/lib/bitmap.c b/trunk/lib/bitmap.c
index 35a1f7ff4149..1338469ac849 100644
--- a/trunk/lib/bitmap.c
+++ b/trunk/lib/bitmap.c
@@ -948,15 +948,15 @@ static int __reg_op(unsigned long *bitmap, int pos, int order, int reg_op)
  */
 int bitmap_find_free_region(unsigned long *bitmap, int bits, int order)
 {
-	int pos, end;		/* scans bitmap by regions of size order */
+	int pos;		/* scans bitmap by regions of size order */
 
-	for (pos = 0 ; (end = pos + (1 << order)) <= bits; pos = end) {
-		if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE))
-			continue;
-		__reg_op(bitmap, pos, order, REG_OP_ALLOC);
-		return pos;
-	}
-	return -ENOMEM;
+	for (pos = 0; pos < bits; pos += (1 << order))
+		if (__reg_op(bitmap, pos, order, REG_OP_ISFREE))
+			break;
+	if (pos == bits)
+		return -ENOMEM;
+	__reg_op(bitmap, pos, order, REG_OP_ALLOC);
+	return pos;
 }
 EXPORT_SYMBOL(bitmap_find_free_region);