diff options
| -rw-r--r-- | kernel/trace/ring_buffer.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 6cf340e1a4a3..162da2305cbc 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
| @@ -620,12 +620,6 @@ static void rb_free_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer) | |||
| 620 | kfree(cpu_buffer); | 620 | kfree(cpu_buffer); |
| 621 | } | 621 | } |
| 622 | 622 | ||
| 623 | /* | ||
| 624 | * Causes compile errors if the struct buffer_page gets bigger | ||
| 625 | * than the struct page. | ||
| 626 | */ | ||
| 627 | extern int ring_buffer_page_too_big(void); | ||
| 628 | |||
| 629 | #ifdef CONFIG_HOTPLUG_CPU | 623 | #ifdef CONFIG_HOTPLUG_CPU |
| 630 | static int rb_cpu_notify(struct notifier_block *self, | 624 | static int rb_cpu_notify(struct notifier_block *self, |
| 631 | unsigned long action, void *hcpu); | 625 | unsigned long action, void *hcpu); |
| @@ -648,11 +642,6 @@ struct ring_buffer *__ring_buffer_alloc(unsigned long size, unsigned flags, | |||
| 648 | int bsize; | 642 | int bsize; |
| 649 | int cpu; | 643 | int cpu; |
| 650 | 644 | ||
| 651 | /* Paranoid! Optimizes out when all is well */ | ||
| 652 | if (sizeof(struct buffer_page) > sizeof(struct page)) | ||
| 653 | ring_buffer_page_too_big(); | ||
| 654 | |||
| 655 | |||
| 656 | /* keep it in its own cache line */ | 645 | /* keep it in its own cache line */ |
| 657 | buffer = kzalloc(ALIGN(sizeof(*buffer), cache_line_size()), | 646 | buffer = kzalloc(ALIGN(sizeof(*buffer), cache_line_size()), |
| 658 | GFP_KERNEL); | 647 | GFP_KERNEL); |
