diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-18 12:03:44 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-18 12:03:44 +1000 |
| commit | d68b8f16d490777da6ed1e074722fcbda7dfab86 (patch) | |
| tree | e3e610598dcf3c417d0f99278b41d825c9aabb87 /kernel | |
| parent | 60856e378069db4431bc1797e17e5609d977b078 (diff) | |
| parent | c6c153bb3fa0006618d4a392a7d9460036a4463d (diff) | |
Merge branch 'quilt/rr'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/smp.c | 7 | ||||
| -rw-r--r-- | kernel/trace/trace.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/kernel/smp.c b/kernel/smp.c index 94188b8ecc33..059e6bf5aa3c 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -335,13 +335,6 @@ void __smp_call_function_single(int cpu, struct call_single_data *data, generic_exec_single(cpu, data, wait); } -/* Deprecated: shim for archs using old arch_send_call_function_ipi API. */ - -#ifndef arch_send_call_function_ipi_mask -# define arch_send_call_function_ipi_mask(maskp) \ - arch_send_call_function_ipi(*(maskp)) -#endif - /** * smp_call_function_many(): Run a function on a set of other CPUs. * @mask: The set of cpus to run on (only runs on online subset). diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c22b40f8f576..6904e381f51c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1920,11 +1920,9 @@ __tracing_open(struct inode *inode, struct file *file) if (current_trace) *iter->trace = *current_trace; - if (!alloc_cpumask_var(&iter->started, GFP_KERNEL)) + if (!zalloc_cpumask_var(&iter->started, GFP_KERNEL)) goto fail; - cpumask_clear(iter->started); - if (current_trace && current_trace->print_max) iter->tr = &max_tr; else @@ -4284,7 +4282,7 @@ __init static int tracer_alloc_buffers(void) if (!alloc_cpumask_var(&tracing_cpumask, GFP_KERNEL)) goto out_free_buffer_mask; - if (!alloc_cpumask_var(&tracing_reader_cpumask, GFP_KERNEL)) + if (!zalloc_cpumask_var(&tracing_reader_cpumask, GFP_KERNEL)) goto out_free_tracing_cpumask; /* To save memory, keep the ring buffer size to its minimum */ @@ -4295,7 +4293,6 @@ __init static int tracer_alloc_buffers(void) cpumask_copy(tracing_buffer_mask, cpu_possible_mask); cpumask_copy(tracing_cpumask, cpu_all_mask); - cpumask_clear(tracing_reader_cpumask); /* TODO: make the number of buffers hot pluggable with CPUS */ global_trace.buffer = ring_buffer_alloc(ring_buf_size, |