From c3c2ec0978b70bb55a32a6cdcc9fae45f61ae4d5 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Tue, 22 Jul 2008 21:08:52 +0200
Subject: [PATCH] --- yaml --- r: 113589 b: refs/heads/master c:
 5e11f98dcebc40c9d67e8d21a5f47248444c17a8 h: refs/heads/master i:   113587:
 9ba680026b8b080e0d86013687a005b5c666b645 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/oprofile/buffer_sync.c | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 28d2367d0925..a1f55dd74a2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73185e0a5d11d729d451692034fbe55a9eba7468
+refs/heads/master: 5e11f98dcebc40c9d67e8d21a5f47248444c17a8
diff --git a/trunk/drivers/oprofile/buffer_sync.c b/trunk/drivers/oprofile/buffer_sync.c
index 69a732778ba7..615929f6f0c2 100644
--- a/trunk/drivers/oprofile/buffer_sync.c
+++ b/trunk/drivers/oprofile/buffer_sync.c
@@ -268,6 +268,17 @@ lookup_dcookie(struct mm_struct *mm, unsigned long addr, off_t *offset)
 	return cookie;
 }
 
+static void increment_tail(struct oprofile_cpu_buffer *b)
+{
+	unsigned long new_tail = b->tail_pos + 1;
+
+	rmb();
+
+	if (new_tail < b->buffer_size)
+		b->tail_pos = new_tail;
+	else
+		b->tail_pos = 0;
+}
 
 static unsigned long last_cookie = INVALID_COOKIE;
 
@@ -417,19 +428,6 @@ static unsigned long get_slots(struct oprofile_cpu_buffer *b)
 }
 
 
-static void increment_tail(struct oprofile_cpu_buffer *b)
-{
-	unsigned long new_tail = b->tail_pos + 1;
-
-	rmb();
-
-	if (new_tail < b->buffer_size)
-		b->tail_pos = new_tail;
-	else
-		b->tail_pos = 0;
-}
-
-
 /* Move tasks along towards death. Any tasks on dead_tasks
  * will definitely have no remaining references in any
  * CPU buffers at this point, because we use two lists,