diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-05 09:58:32 -0500 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-05 09:58:32 -0500 |
| commit | 3fd9396af83a1e69eaf9ebb573207431d8f265b6 (patch) | |
| tree | f221f5777695de71ea97423c67438bca1746e26c /kernel/trace/ring_buffer.c | |
| parent | e3978cded41dc7b364e74037f56d6bc558c11fd7 (diff) | |
| parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
Merge tag 'v3.7-rc4' into upstream-master
Linux 3.7-rc4
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index b32ed0e385a5..b979426d16c6 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
| @@ -1567,6 +1567,10 @@ int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size, | |||
| 1567 | 1567 | ||
| 1568 | put_online_cpus(); | 1568 | put_online_cpus(); |
| 1569 | } else { | 1569 | } else { |
| 1570 | /* Make sure this CPU has been intitialized */ | ||
| 1571 | if (!cpumask_test_cpu(cpu_id, buffer->cpumask)) | ||
| 1572 | goto out; | ||
| 1573 | |||
| 1570 | cpu_buffer = buffer->buffers[cpu_id]; | 1574 | cpu_buffer = buffer->buffers[cpu_id]; |
| 1571 | 1575 | ||
| 1572 | if (nr_pages == cpu_buffer->nr_pages) | 1576 | if (nr_pages == cpu_buffer->nr_pages) |