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

Commit a252852a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'urgent' of... 

Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
parents d91309f6 d14dd7e2

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 */

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 */