Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 06:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ingo Molnar 2011-02-15 04:10:35 +01:00
commit a252852afa
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/oprofile/common.c
View File

@ -10,8 +10,6 @@
*/ */
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/oprofile.h> #include <linux/oprofile.h>
@ -46,6 +44,7 @@ char *op_name_from_perf_id(void)
return NULL; return NULL;
} }
} }
#endif
static int report_trace(struct stackframe *frame, void *d) 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) int __init oprofile_arch_init(struct oprofile_operations *ops)
{ {
/* provide backtrace support also in timer mode: */
ops->backtrace = arm_backtrace; ops->backtrace = arm_backtrace;
return oprofile_perf_init(ops); return oprofile_perf_init(ops);
@ -120,11 +120,3 @@ void __exit oprofile_arch_exit(void)
{ {
oprofile_perf_exit(); 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 */

13
include/linux/oprofile.h
View File

@ -16,6 +16,8 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/errno.h>
#include <linux/printk.h>
#include <asm/atomic.h> #include <asm/atomic.h>
/* Each escaped entry is prefixed by ESCAPE_CODE /* 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_add_data64(struct op_entry *entry, u64 val);
int oprofile_write_commit(struct op_entry *entry); 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); int __init oprofile_perf_init(struct oprofile_operations *ops);
void oprofile_perf_exit(void); void oprofile_perf_exit(void);
char *op_name_from_perf_id(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 */ #endif /* OPROFILE_H */