Linus Torvalds
ada3fa1505
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits)
powerpc64: convert to dynamic percpu allocator
sparc64: use embedding percpu first chunk allocator
percpu: kill lpage first chunk allocator
x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA
percpu: update embedding first chunk allocator to handle sparse units
percpu: use group information to allocate vmap areas sparsely
vmalloc: implement pcpu_get_vm_areas()
vmalloc: separate out insert_vmalloc_vm()
percpu: add chunk->base_addr
percpu: add pcpu_unit_offsets[]
percpu: introduce pcpu_alloc_info and pcpu_group_info
percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward
percpu: add @align to pcpu_fc_alloc_fn_t
percpu: make @dyn_size mandatory for pcpu_setup_first_chunk()
percpu: drop @static_size from first chunk allocators
percpu: generalize first chunk allocator selection
percpu: build first chunk allocators selectively
percpu: rename 4k first chunk allocator to page
percpu: improve boot messages
percpu: fix pcpu_reclaim() locking
...
Fix trivial conflict as by Tejun Heo in kernel/sched.c
2009-09-15 09:39:44 -07:00
..
blktrace.c
Merge commit 'v2.6.31-rc9' into tracing/core
2009-09-06 06:11:42 +02:00
ftrace.c
Merge commit 'v2.6.31-rc9' into tracing/core
2009-09-06 06:11:42 +02:00
Kconfig
ring-buffer: only enable ring_buffer_swap_cpu when needed
2009-09-04 19:42:22 -04:00
kmemtrace.c
tracing: remove users of tracing_reset
2009-09-04 12:12:39 -04:00
Makefile
tracing/events: convert block trace points to TRACE_EVENT()
2009-06-09 12:34:23 -04:00
ring_buffer.c
ring-buffer: only enable ring_buffer_swap_cpu when needed
2009-09-04 19:42:22 -04:00
ring_buffer_benchmark.c
ring-buffer: have benchmark test print to trace buffer
2009-06-17 17:01:09 -04:00
trace.c
Merge commit 'v2.6.31-rc9' into tracing/core
2009-09-06 06:11:42 +02:00
trace.h
tracing: add trace_array_printk for internal tracers to use
2009-09-04 19:13:53 -04:00
trace_boot.c
tracing: pass around ring buffer instead of tracer
2009-09-04 18:59:39 -04:00
trace_branch.c
Merge branch 'linus' into tracing/core
2009-05-07 11:17:34 +02:00
trace_clock.c
trace_event_profile.c
ftrace: Fix perf-tracepoint OOPS
2009-08-06 06:26:09 +02:00
trace_event_types.h
trace_export: Repair missed fields
2009-06-26 20:48:40 +02:00
trace_events.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2009-09-15 09:39:44 -07:00
trace_events_filter.c
tracing/filters: Defer pred allocation, fix memory leak
2009-09-04 23:22:33 +02:00
trace_export.c
tracing/filters: Defer pred allocation
2009-08-31 10:58:08 +02:00
trace_functions.c
Merge branch 'linus' into tracing/core
2009-07-18 12:20:01 +02:00
trace_functions_graph.c
tracing: pass around ring buffer instead of tracer
2009-09-04 18:59:39 -04:00
trace_hw_branches.c
Merge branch 'tracing/hw-branch-tracing' into tracing/core
2009-05-07 13:36:22 +02:00
trace_irqsoff.c
tracing: use timestamp to determine start of latency traces
2009-09-04 18:44:22 -04:00
trace_mmiotrace.c
tracing: pass around ring buffer instead of tracer
2009-09-04 18:59:39 -04:00
trace_nop.c
trace_output.c
tracing: Fix trace_print_seq()
2009-07-02 08:51:13 +02:00
trace_output.h
tracing: add protection around module events unload
2009-06-09 17:29:07 -04:00
trace_power.c
tracing: pass around ring buffer instead of tracer
2009-09-04 18:59:39 -04:00
trace_printk.c
tracing: show proper address for trace-printk format
2009-07-23 10:07:17 -04:00
trace_sched_switch.c
tracing: pass around ring buffer instead of tracer
2009-09-04 18:59:39 -04:00
trace_sched_wakeup.c
tracing: use timestamp to determine start of latency traces
2009-09-04 18:44:22 -04:00
trace_selftest.c
tracing/function-graph-tracer: Move graph event insertion helpers in the graph tracer file
2009-08-06 07:28:06 +02:00
trace_selftest_dynamic.c
trace_stack.c
trace_stack: Simplify seqfile code
2009-08-17 11:25:09 +02:00
trace_stat.c
trace_stat: Fix missing entry in stat file
2009-08-17 11:25:09 +02:00
trace_stat.h
tracing/stat: Add stat_release() callback
2009-07-10 12:14:05 +02:00
trace_syscalls.c
tracing: pass around ring buffer instead of tracer
2009-09-04 18:59:39 -04:00
trace_sysprof.c
Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-06-15 10:06:19 -07:00
trace_workqueue.c
tracing/workqueues: Add refcnt to struct cpu_workqueue_stats
2009-07-10 12:14:07 +02:00