summaryrefslogtreecommitdiffstats
path: root/drivers/oprofile/cpu_buffer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-07 10:30:50 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-07 10:30:50 +0200
commit7f60ba388f5b9dd8b0da463b394412dace3ab814 (patch)
treeb97b4fb5c8ad07a435e5b1b559988364764d5e8d /drivers/oprofile/cpu_buffer.c
parentMerge tag 'for-v3.7' of git://git.infradead.org/battery-2.6 (diff)
parentpstore: Avoid recursive spinlocks in the oops_in_progress case (diff)
downloadlinux-7f60ba388f5b9dd8b0da463b394412dace3ab814.tar.xz
linux-7f60ba388f5b9dd8b0da463b394412dace3ab814.zip
Merge tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore
Pull pstore changes from Anton Vorontsov: 1) We no longer ad-hoc to the function tracer "high level" infrastructure and no longer use its debugfs knobs. The change slightly touches kernel/trace directory, but it got the needed ack from Steven Rostedt: http://lkml.org/lkml/2012/8/21/688 2) Added maintainers entry; 3) A bunch of fixes, nothing special. * tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore: pstore: Avoid recursive spinlocks in the oops_in_progress case pstore/ftrace: Convert to its own enable/disable debugfs knob pstore/ram: Add missing platform_device_unregister MAINTAINERS: Add pstore maintainers pstore/ram: Mark ramoops_pstore_write_buf() as notrace pstore/ram: Fix printk format warning pstore/ram: Fix possible NULL dereference
Diffstat (limited to 'drivers/oprofile/cpu_buffer.c')
0 files changed, 0 insertions, 0 deletions