diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-08 22:30:28 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-08 22:30:47 -0700 |
| commit | 4d8f509e7a5d2eb636d57ddb677e504a90a4f99d (patch) | |
| tree | 2f359163b1e8a08bd0d3a478096d80623582bfbf /kernel/trace/ring_buffer.c | |
| parent | b9747b3aafa7687414491e789c1a1b05c8781018 (diff) | |
| parent | 3cc3b617dc39dad1e566ccfc4500154cb7c51aa3 (diff) | |
| download | lwn-4d8f509e7a5d2eb636d57ddb677e504a90a4f99d.tar.gz lwn-4d8f509e7a5d2eb636d57ddb677e504a90a4f99d.zip | |
Merge tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/fixes-non-critical
From Barry Song, SiRF fixes for v3.10 (that we're punting to 3.11):
- Replace include linux/module.h with linux/export.h
- fix a checkpatch issue
- use of_platform_populate instead of of_platform_bus_probe
* tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
arm: prima2: use of_platform_populate instead of of_platform_bus_probe
ARM: prima2: fix a checkpatch issue
ARM: prima2: Replace include linux/module.h with linux/export.h
+ Linux 3.10-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index b59aea2c48c2..e444ff88f0a4 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -620,6 +620,9 @@ int ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu, if (cpu == RING_BUFFER_ALL_CPUS) work = &buffer->irq_work; else { + if (!cpumask_test_cpu(cpu, buffer->cpumask)) + return -EINVAL; + cpu_buffer = buffer->buffers[cpu]; work = &cpu_buffer->irq_work; } |