diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-12-08 11:18:47 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-12-08 11:18:47 -0500 |
| commit | c35fa3ea1ae8198bd65c2c6e59d9ebd68c115a59 (patch) | |
| tree | 878768b69df25459b448aa890352342c4a3c6e2d /kernel/trace/ring_buffer.c | |
| parent | dcc7461eef7341e84e2f7274f904ce01a43b2506 (diff) | |
| parent | 218d11a8b071b23b76c484fd5f72a4fe3306801e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index f780e9552f91..668bbb5ef2bd 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
| @@ -1215,7 +1215,7 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer, | |||
| 1215 | 1215 | ||
| 1216 | out: | 1216 | out: |
| 1217 | if (resched) | 1217 | if (resched) |
| 1218 | preempt_enable_notrace(); | 1218 | preempt_enable_no_resched_notrace(); |
| 1219 | else | 1219 | else |
| 1220 | preempt_enable_notrace(); | 1220 | preempt_enable_notrace(); |
| 1221 | return NULL; | 1221 | return NULL; |