---

yaml --- r: 176477 b: refs/heads/master c: e625cce h: refs/heads/master i: 176475: edca39f v: v3
git-mirror · Dec 14, 2009 · f947c92 · f947c92
1 parent 3a9d6ba
commit f947c92
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 57 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecb49d1a639acbacfc3771cae5ec07bed5df3847
+refs/heads/master: e625cce1b73fb38b74e5387226534f7bcbfc36fe
diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h
@@ -681,7 +681,7 @@ struct perf_event_context {
 	 * Protect the states of the events in the list,
 	 * nr_active, and the list:
 	 */
-	spinlock_t			lock;
+	raw_spinlock_t			lock;
 	/*
 	 * Protect the list of events.  Locking either mutex or lock
 	 * is sufficient to ensure the list doesn't change; to change

diff --git a/trunk/kernel/hw_breakpoint.c b/trunk/kernel/hw_breakpoint.c
@@ -96,7 +96,7 @@ static int task_bp_pinned(struct task_struct *tsk)
 
 	list = &ctx->event_list;
 
-	spin_lock_irqsave(&ctx->lock, flags);
+	raw_spin_lock_irqsave(&ctx->lock, flags);
 
 	/*
 	 * The current breakpoint counter is not included in the list
@@ -107,7 +107,7 @@ static int task_bp_pinned(struct task_struct *tsk)
 			count++;
 	}
 
-	spin_unlock_irqrestore(&ctx->lock, flags);
+	raw_spin_unlock_irqrestore(&ctx->lock, flags);
 
 	return count;
 }