A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'x86/core' into tracing/textedit

Browse source 
Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Ingo Molnar 2009-03-06 16:44:14 +01:00
commit f0ef039851
517 changed files with 19097 additions and 18460 deletions
Download patch file Download diff file Expand all files Collapse all files

22
drivers/oprofile/buffer_sync.c
View file

@ -38,7 +38,7 @@
static LIST_HEAD(dying_tasks);
static LIST_HEAD(dead_tasks);
static cpumask_t marked_cpus = CPU_MASK_NONE;
static cpumask_var_t marked_cpus;
static DEFINE_SPINLOCK(task_mortuary);
static void process_task_mortuary(void);
@ -456,10 +456,10 @@ static void mark_done(int cpu)
{
int i;
cpu_set(cpu, marked_cpus);
cpumask_set_cpu(cpu, marked_cpus);
for_each_online_cpu(i) {
if (!cpu_isset(i, marked_cpus))
if (!cpumask_test_cpu(i, marked_cpus))
return;
}
@ -468,7 +468,7 @@ static void mark_done(int cpu)
*/
process_task_mortuary();
cpus_clear(marked_cpus);
cpumask_clear(marked_cpus);
}
@ -565,6 +565,20 @@ void sync_buffer(int cpu)
mutex_unlock(&buffer_mutex);
}
int __init buffer_sync_init(void)
{
if (!alloc_cpumask_var(&marked_cpus, GFP_KERNEL))
return -ENOMEM;
cpumask_clear(marked_cpus);
return 0;
}
void __exit buffer_sync_cleanup(void)
{
free_cpumask_var(marked_cpus);
}
/* The function can be used to add a buffer worth of data directly to
* the kernel buffer. The buffer is assumed to be a circular buffer.
* Take the entries from index start and end at index end, wrapping

4
drivers/oprofile/buffer_sync.h
View file

@ -19,4 +19,8 @@ void sync_stop(void);
/* sync the given CPU's buffer */
void sync_buffer(int cpu);
/* initialize/destroy the buffer system. */
int buffer_sync_init(void);
void buffer_sync_cleanup(void);
#endif /* OPROFILE_BUFFER_SYNC_H */

9
drivers/oprofile/oprof.c
View file

@ -183,6 +183,10 @@ static int __init oprofile_init(void)
{
int err;
err = buffer_sync_init();
if (err)
return err;
err = oprofile_arch_init(&oprofile_ops);
if (err < 0 || timer) {
@ -191,8 +195,10 @@ static int __init oprofile_init(void)
}
err = oprofilefs_register();
if (err)
if (err) {
oprofile_arch_exit();
buffer_sync_cleanup();
}
return err;
}
@ -202,6 +208,7 @@ static void __exit oprofile_exit(void)
{
oprofilefs_unregister();
oprofile_arch_exit();
buffer_sync_cleanup();
}