Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cecd791 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus' of... 

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix text_poke_smp_batch() deadlock
  perf tools: Fix thread_map event synthesizing in top and record
  watchdog, nmi: Lower the severity of error messages
  ARM: oprofile: Fix backtraces in timer mode
  oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends
parents fef86db8 a252852a

arch/arm/oprofile/common.c

+2 −10
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
 */



#include <linux/cpumask.h>

#include <linux/err.h>

#include <linux/errno.h>

#include <linux/init.h>

#include <linux/mutex.h>

#include <linux/oprofile.h>
@@ -46,6 +44,7 @@ char *op_name_from_perf_id(void) 
		return NULL;

	}

}

#endif



static int report_trace(struct stackframe *frame, void *d)

{
@@ -111,6 +110,7 @@ static void arm_backtrace(struct pt_regs * const regs, unsigned int depth) 


int __init oprofile_arch_init(struct oprofile_operations *ops)

{

	/* provide backtrace support also in timer mode: */

	ops->backtrace		= arm_backtrace;



	return oprofile_perf_init(ops);
@@ -120,11 +120,3 @@ void __exit oprofile_arch_exit(void) 
{

	oprofile_perf_exit();

}
 
#else

int __init oprofile_arch_init(struct oprofile_operations *ops)

{

	pr_info("oprofile: hardware counters not available\n");

	return -ENODEV;

}

void __exit oprofile_arch_exit(void) {}

#endif /* CONFIG_HW_PERF_EVENTS */

arch/x86/kernel/alternative.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ void __kprobes text_poke_smp_batch(struct text_poke_param *params, int n) 


	atomic_set(&stop_machine_first, 1);

	wrote_text = 0;

	stop_machine(stop_machine_text_poke, (void *)&tpp, NULL);

	__stop_machine(stop_machine_text_poke, (void *)&tpp, NULL);

}



#if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL)

include/linux/oprofile.h

+11 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/types.h>

#include <linux/spinlock.h>

#include <linux/init.h>

#include <linux/errno.h>

#include <linux/printk.h>

#include <asm/atomic.h>

 

/* Each escaped entry is prefixed by ESCAPE_CODE
@@ -186,10 +188,17 @@ int oprofile_add_data(struct op_entry *entry, unsigned long val); 
int oprofile_add_data64(struct op_entry *entry, u64 val);

int oprofile_write_commit(struct op_entry *entry);



#ifdef CONFIG_PERF_EVENTS

#ifdef CONFIG_HW_PERF_EVENTS

int __init oprofile_perf_init(struct oprofile_operations *ops);

void oprofile_perf_exit(void);

char *op_name_from_perf_id(void);

#endif /* CONFIG_PERF_EVENTS */

#else

static inline int __init oprofile_perf_init(struct oprofile_operations *ops)

{

	pr_info("oprofile: hardware counters not available\n");

	return -ENODEV;

}

static inline void oprofile_perf_exit(void) { }

#endif /* CONFIG_HW_PERF_EVENTS */



#endif /* OPROFILE_H */

kernel/watchdog.c

+8 −2
Original line number Diff line number Diff line
@@ -363,8 +363,14 @@ static int watchdog_nmi_enable(int cpu) 
		goto out_save;

	}



	printk(KERN_ERR "NMI watchdog disabled for cpu%i: unable to create perf event: %ld\n",

	       cpu, PTR_ERR(event));



	/* vary the KERN level based on the returned errno */

	if (PTR_ERR(event) == -EOPNOTSUPP)

		printk(KERN_INFO "NMI watchdog disabled (cpu%i): not supported (no LAPIC?)\n", cpu);

	else if (PTR_ERR(event) == -ENOENT)

		printk(KERN_WARNING "NMI watchdog disabled (cpu%i): hardware events not enabled\n", cpu);

	else

		printk(KERN_ERR "NMI watchdog disabled (cpu%i): unable to create perf event: %ld\n", cpu, PTR_ERR(event));

	return PTR_ERR(event);



	/* success path */

tools/perf/builtin-record.c

+2 −2
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ static int __cmd_record(int argc, const char **argv) 
		perf_session__process_machines(session, event__synthesize_guest_os);



	if (!system_wide)

		event__synthesize_thread(target_tid, process_synthesized_event,

		event__synthesize_thread_map(threads, process_synthesized_event,

					     session);

	else

		event__synthesize_threads(process_synthesized_event, session);