diff options
Diffstat (limited to 'kernel/trace/ring_buffer.c')
-rw-r--r-- | kernel/trace/ring_buffer.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index eab81f918f6a..bb6922a931b1 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
@@ -258,7 +258,6 @@ struct ring_buffer_per_cpu { | |||
258 | }; | 258 | }; |
259 | 259 | ||
260 | struct ring_buffer { | 260 | struct ring_buffer { |
261 | unsigned long size; | ||
262 | unsigned pages; | 261 | unsigned pages; |
263 | unsigned flags; | 262 | unsigned flags; |
264 | int cpus; | 263 | int cpus; |
@@ -2210,8 +2209,7 @@ int ring_buffer_swap_cpu(struct ring_buffer *buffer_a, | |||
2210 | return -EINVAL; | 2209 | return -EINVAL; |
2211 | 2210 | ||
2212 | /* At least make sure the two buffers are somewhat the same */ | 2211 | /* At least make sure the two buffers are somewhat the same */ |
2213 | if (buffer_a->size != buffer_b->size || | 2212 | if (buffer_a->pages != buffer_b->pages) |
2214 | buffer_a->pages != buffer_b->pages) | ||
2215 | return -EINVAL; | 2213 | return -EINVAL; |
2216 | 2214 | ||
2217 | cpu_buffer_a = buffer_a->buffers[cpu]; | 2215 | cpu_buffer_a = buffer_a->buffers[cpu]; |