diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 16:02:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 16:02:06 -0700 |
commit | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (patch) | |
tree | 8a3ff82f4b7ae26df4f7c8b4c852748f7533a418 /kernel | |
parent | dcbb5593d980bbf4ceef320f8c75210398ed84db (diff) | |
parent | 5ac7687860dbfd3dd90e09d2c10dd31de91f20c2 (diff) | |
download | kernel_samsung_tuna-ebc79c4f8da0f92efa968e0328f32334a2ce80cf.zip kernel_samsung_tuna-ebc79c4f8da0f92efa968e0328f32334a2ce80cf.tar.gz kernel_samsung_tuna-ebc79c4f8da0f92efa968e0328f32334a2ce80cf.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6:
includecheck fix: x86, cpu/common.c
includecheck fix: kernel/trace, ring_buffer.c
includecheck fix: include/linux, ftrace.h
includecheck fix: include/linux, page_cgroup.h
includecheck fix: include/linux, aio.h
includecheck fix: include/drm, drm_memory.h
includecheck fix: include/acpi, acpi_bus.h
includecheck fix: drivers/xen, evtchn.c
includecheck fix: drivers/video, vgacon.c
includecheck fix: drivers/scsi, ibmvscsi.c
includecheck fix: drivers/scsi, libfcoe.c
includecheck fix: x86, shadow.c
includecheck fix: x86, traps.c
includecheck fix: um, helper.c
includecheck fix: s390, sys_s390.c
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/ring_buffer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 6eef389..d4ff019 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -201,8 +201,6 @@ int tracing_is_on(void) } EXPORT_SYMBOL_GPL(tracing_is_on); -#include "trace.h" - #define RB_EVNT_HDR_SIZE (offsetof(struct ring_buffer_event, array)) #define RB_ALIGNMENT 4U #define RB_MAX_SMALL_DATA (RB_ALIGNMENT * RINGBUF_TYPE_DATA_TYPE_LEN_MAX) |