Commit e309b41d authored by Ingo Molnar's avatar Ingo Molnar Committed by Thomas Gleixner
Browse files

ftrace: remove notrace



now that we have a kbuild method for notrace, no need to pollute the
C code with the annotations.
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b53dde9d
......@@ -53,7 +53,7 @@ ftrace_func_t ftrace_trace_function __read_mostly = ftrace_stub;
/* mcount is defined per arch in assembly */
EXPORT_SYMBOL(mcount);
notrace void ftrace_list_func(unsigned long ip, unsigned long parent_ip)
void ftrace_list_func(unsigned long ip, unsigned long parent_ip)
{
struct ftrace_ops *op = ftrace_list;
......@@ -79,7 +79,7 @@ void clear_ftrace_function(void)
ftrace_trace_function = ftrace_stub;
}
static int notrace __register_ftrace_function(struct ftrace_ops *ops)
static int __register_ftrace_function(struct ftrace_ops *ops)
{
/* Should never be called by interrupts */
spin_lock(&ftrace_lock);
......@@ -110,7 +110,7 @@ static int notrace __register_ftrace_function(struct ftrace_ops *ops)
return 0;
}
static int notrace __unregister_ftrace_function(struct ftrace_ops *ops)
static int __unregister_ftrace_function(struct ftrace_ops *ops)
{
struct ftrace_ops **p;
int ret = 0;
......@@ -197,7 +197,7 @@ static int ftrace_record_suspend;
static struct dyn_ftrace *ftrace_free_records;
static inline int notrace
static inline int
ftrace_ip_in_hash(unsigned long ip, unsigned long key)
{
struct dyn_ftrace *p;
......@@ -214,13 +214,13 @@ ftrace_ip_in_hash(unsigned long ip, unsigned long key)
return found;
}
static inline void notrace
static inline void
ftrace_add_hash(struct dyn_ftrace *node, unsigned long key)
{
hlist_add_head(&node->node, &ftrace_hash[key]);
}
static notrace void ftrace_free_rec(struct dyn_ftrace *rec)
static void ftrace_free_rec(struct dyn_ftrace *rec)
{
/* no locking, only called from kstop_machine */
......@@ -229,7 +229,7 @@ static notrace void ftrace_free_rec(struct dyn_ftrace *rec)
rec->flags |= FTRACE_FL_FREE;
}
static notrace struct dyn_ftrace *ftrace_alloc_dyn_node(unsigned long ip)
static struct dyn_ftrace *ftrace_alloc_dyn_node(unsigned long ip)
{
struct dyn_ftrace *rec;
......@@ -259,7 +259,7 @@ static notrace struct dyn_ftrace *ftrace_alloc_dyn_node(unsigned long ip)
return &ftrace_pages->records[ftrace_pages->index++];
}
static void notrace
static void
ftrace_record_ip(unsigned long ip)
{
struct dyn_ftrace *node;
......@@ -329,7 +329,7 @@ ftrace_record_ip(unsigned long ip)
#define FTRACE_ADDR ((long)(ftrace_caller))
#define MCOUNT_ADDR ((long)(mcount))
static void notrace
static void
__ftrace_replace_code(struct dyn_ftrace *rec,
unsigned char *old, unsigned char *new, int enable)
{
......@@ -405,7 +405,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec,
}
}
static void notrace ftrace_replace_code(int enable)
static void ftrace_replace_code(int enable)
{
unsigned char *new = NULL, *old = NULL;
struct dyn_ftrace *rec;
......@@ -430,7 +430,7 @@ static void notrace ftrace_replace_code(int enable)
}
}
static notrace void ftrace_shutdown_replenish(void)
static void ftrace_shutdown_replenish(void)
{
if (ftrace_pages->next)
return;
......@@ -439,7 +439,7 @@ static notrace void ftrace_shutdown_replenish(void)
ftrace_pages->next = (void *)get_zeroed_page(GFP_KERNEL);
}
static notrace void
static void
ftrace_code_disable(struct dyn_ftrace *rec)
{
unsigned long ip;
......@@ -458,7 +458,7 @@ ftrace_code_disable(struct dyn_ftrace *rec)
}
}
static int notrace __ftrace_modify_code(void *data)
static int __ftrace_modify_code(void *data)
{
unsigned long addr;
int *command = data;
......@@ -482,14 +482,14 @@ static int notrace __ftrace_modify_code(void *data)
return 0;
}
static void notrace ftrace_run_update_code(int command)
static void ftrace_run_update_code(int command)
{
stop_machine_run(__ftrace_modify_code, &command, NR_CPUS);
}
static ftrace_func_t saved_ftrace_func;
static void notrace ftrace_startup(void)
static void ftrace_startup(void)
{
int command = 0;
......@@ -514,7 +514,7 @@ static void notrace ftrace_startup(void)
mutex_unlock(&ftraced_lock);
}
static void notrace ftrace_shutdown(void)
static void ftrace_shutdown(void)
{
int command = 0;
......@@ -539,7 +539,7 @@ static void notrace ftrace_shutdown(void)
mutex_unlock(&ftraced_lock);
}
static void notrace ftrace_startup_sysctl(void)
static void ftrace_startup_sysctl(void)
{
int command = FTRACE_ENABLE_MCOUNT;
......@@ -557,7 +557,7 @@ static void notrace ftrace_startup_sysctl(void)
mutex_unlock(&ftraced_lock);
}
static void notrace ftrace_shutdown_sysctl(void)
static void ftrace_shutdown_sysctl(void)
{
int command = FTRACE_DISABLE_MCOUNT;
......@@ -577,7 +577,7 @@ static cycle_t ftrace_update_time;
static unsigned long ftrace_update_cnt;
unsigned long ftrace_update_tot_cnt;
static int notrace __ftrace_update_code(void *ignore)
static int __ftrace_update_code(void *ignore)
{
struct dyn_ftrace *p;
struct hlist_head head;
......@@ -618,7 +618,7 @@ static int notrace __ftrace_update_code(void *ignore)
return 0;
}
static void notrace ftrace_update_code(void)
static void ftrace_update_code(void)
{
if (unlikely(ftrace_disabled))
return;
......@@ -626,7 +626,7 @@ static void notrace ftrace_update_code(void)
stop_machine_run(__ftrace_update_code, NULL, NR_CPUS);
}
static int notrace ftraced(void *ignore)
static int ftraced(void *ignore)
{
unsigned long usecs;
......@@ -733,7 +733,7 @@ struct ftrace_iterator {
unsigned filtered;
};
static void notrace *
static void *
t_next(struct seq_file *m, void *v, loff_t *pos)
{
struct ftrace_iterator *iter = m->private;
......@@ -806,7 +806,7 @@ static struct seq_operations show_ftrace_seq_ops = {
.show = t_show,
};
static int notrace
static int
ftrace_avail_open(struct inode *inode, struct file *file)
{
struct ftrace_iterator *iter;
......@@ -845,7 +845,7 @@ int ftrace_avail_release(struct inode *inode, struct file *file)
return 0;
}
static void notrace ftrace_filter_reset(void)
static void ftrace_filter_reset(void)
{
struct ftrace_page *pg;
struct dyn_ftrace *rec;
......@@ -867,7 +867,7 @@ static void notrace ftrace_filter_reset(void)
preempt_enable();
}
static int notrace
static int
ftrace_filter_open(struct inode *inode, struct file *file)
{
struct ftrace_iterator *iter;
......@@ -903,7 +903,7 @@ ftrace_filter_open(struct inode *inode, struct file *file)
return ret;
}
static ssize_t notrace
static ssize_t
ftrace_filter_read(struct file *file, char __user *ubuf,
size_t cnt, loff_t *ppos)
{
......@@ -913,7 +913,7 @@ ftrace_filter_read(struct file *file, char __user *ubuf,
return -EPERM;
}
static loff_t notrace
static loff_t
ftrace_filter_lseek(struct file *file, loff_t offset, int origin)
{
loff_t ret;
......@@ -933,7 +933,7 @@ enum {
MATCH_END_ONLY,
};
static void notrace
static void
ftrace_match(unsigned char *buff, int len)
{
char str[KSYM_SYMBOL_LEN];
......@@ -1002,7 +1002,7 @@ ftrace_match(unsigned char *buff, int len)
preempt_enable();
}
static ssize_t notrace
static ssize_t
ftrace_filter_write(struct file *file, const char __user *ubuf,
size_t cnt, loff_t *ppos)
{
......@@ -1094,7 +1094,7 @@ ftrace_filter_write(struct file *file, const char __user *ubuf,
* Filters denote which functions should be enabled when tracing is enabled.
* If @buf is NULL and reset is set, all functions will be enabled for tracing.
*/
notrace void ftrace_set_filter(unsigned char *buf, int len, int reset)
void ftrace_set_filter(unsigned char *buf, int len, int reset)
{
if (unlikely(ftrace_disabled))
return;
......@@ -1107,7 +1107,7 @@ notrace void ftrace_set_filter(unsigned char *buf, int len, int reset)
mutex_unlock(&ftrace_filter_lock);
}
static int notrace
static int
ftrace_filter_release(struct inode *inode, struct file *file)
{
struct seq_file *m = (struct seq_file *)file->private_data;
......@@ -1242,7 +1242,7 @@ static __init int ftrace_init_debugfs(void)
fs_initcall(ftrace_init_debugfs);
static int __init notrace ftrace_dynamic_init(void)
static int __init ftrace_dynamic_init(void)
{
struct task_struct *p;
unsigned long addr;
......@@ -1352,7 +1352,7 @@ int unregister_ftrace_function(struct ftrace_ops *ops)
return ret;
}
notrace int
int
ftrace_enable_sysctl(struct ctl_table *table, int write,
struct file *file, void __user *buffer, size_t *lenp,
loff_t *ppos)
......
......@@ -35,7 +35,7 @@ unsigned long __read_mostly tracing_thresh;
static int tracing_disabled = 1;
static long notrace
static long
ns2usecs(cycle_t nsec)
{
nsec += 500;
......@@ -43,7 +43,7 @@ ns2usecs(cycle_t nsec)
return nsec;
}
notrace cycle_t ftrace_now(int cpu)
cycle_t ftrace_now(int cpu)
{
return cpu_clock(cpu);
}
......@@ -135,7 +135,7 @@ static DEFINE_SPINLOCK(ftrace_max_lock);
* structure. (this way the maximum trace is permanently saved,
* for later retrieval via /debugfs/tracing/latency_trace)
*/
static notrace void
static void
__update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)
{
struct trace_array_cpu *data = tr->data[cpu];
......@@ -184,7 +184,7 @@ void *head_page(struct trace_array_cpu *data)
return page_address(page);
}
static notrace int
static int
trace_seq_printf(struct trace_seq *s, const char *fmt, ...)
{
int len = (PAGE_SIZE - 1) - s->len;
......@@ -207,7 +207,7 @@ trace_seq_printf(struct trace_seq *s, const char *fmt, ...)
return len;
}
static notrace int
static int
trace_seq_puts(struct trace_seq *s, const char *str)
{
int len = strlen(str);
......@@ -221,7 +221,7 @@ trace_seq_puts(struct trace_seq *s, const char *str)
return len;
}
static notrace int
static int
trace_seq_putc(struct trace_seq *s, unsigned char c)
{
if (s->len >= (PAGE_SIZE - 1))
......@@ -232,7 +232,7 @@ trace_seq_putc(struct trace_seq *s, unsigned char c)
return 1;
}
static notrace int
static int
trace_seq_putmem(struct trace_seq *s, void *mem, size_t len)
{
if (len > ((PAGE_SIZE - 1) - s->len))
......@@ -246,7 +246,7 @@ trace_seq_putmem(struct trace_seq *s, void *mem, size_t len)
#define HEX_CHARS 17
static notrace int
static int
trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len)
{
unsigned char hex[HEX_CHARS];
......@@ -285,13 +285,13 @@ trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len)
return trace_seq_putmem(s, hex, j);
}
static notrace void
static void
trace_seq_reset(struct trace_seq *s)
{
s->len = 0;
}
static notrace void
static void
trace_print_seq(struct seq_file *m, struct trace_seq *s)
{
int len = s->len >= PAGE_SIZE ? PAGE_SIZE - 1 : s->len;
......@@ -302,7 +302,7 @@ trace_print_seq(struct seq_file *m, struct trace_seq *s)
trace_seq_reset(s);
}
notrace static void
static void
flip_trace(struct trace_array_cpu *tr1, struct trace_array_cpu *tr2)
{
struct list_head flip_pages;
......@@ -323,7 +323,7 @@ flip_trace(struct trace_array_cpu *tr1, struct trace_array_cpu *tr2)
check_pages(tr2);
}
notrace void
void
update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)
{
struct trace_array_cpu *data;
......@@ -348,7 +348,7 @@ update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)
* @tsk - task with the latency
* @cpu - the cpu of the buffer to copy.
*/
notrace void
void
update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu)
{
struct trace_array_cpu *data = tr->data[cpu];
......@@ -471,7 +471,7 @@ void unregister_tracer(struct tracer *type)
mutex_unlock(&trace_types_lock);
}
notrace void tracing_reset(struct trace_array_cpu *data)
void tracing_reset(struct trace_array_cpu *data)
{
data->trace_idx = 0;
data->trace_head = data->trace_tail = head_page(data);
......@@ -494,9 +494,9 @@ static void trace_init_cmdlines(void)
cmdline_idx = 0;
}
notrace void trace_stop_cmdline_recording(void);
void trace_stop_cmdline_recording(void);
static notrace void trace_save_cmdline(struct task_struct *tsk)
static void trace_save_cmdline(struct task_struct *tsk)
{
unsigned map;
unsigned idx;
......@@ -531,7 +531,7 @@ static notrace void trace_save_cmdline(struct task_struct *tsk)
spin_unlock(&trace_cmdline_lock);
}
static notrace char *trace_find_cmdline(int pid)
static char *trace_find_cmdline(int pid)
{
char *cmdline = "<...>";
unsigned map;
......@@ -552,7 +552,7 @@ static notrace char *trace_find_cmdline(int pid)
return cmdline;
}
notrace void tracing_record_cmdline(struct task_struct *tsk)
void tracing_record_cmdline(struct task_struct *tsk)
{
if (atomic_read(&trace_record_cmdline_disabled))
return;
......@@ -560,7 +560,7 @@ notrace void tracing_record_cmdline(struct task_struct *tsk)
trace_save_cmdline(tsk);
}
static inline notrace struct list_head *
static inline struct list_head *
trace_next_list(struct trace_array_cpu *data, struct list_head *next)
{
/*
......@@ -574,7 +574,7 @@ trace_next_list(struct trace_array_cpu *data, struct list_head *next)
return next;
}
static inline notrace void *
static inline void *
trace_next_page(struct trace_array_cpu *data, void *addr)
{
struct list_head *next;
......@@ -588,7 +588,7 @@ trace_next_page(struct trace_array_cpu *data, void *addr)
return page_address(page);
}
static inline notrace struct trace_entry *
static inline struct trace_entry *
tracing_get_trace_entry(struct trace_array *tr, struct trace_array_cpu *data)
{
unsigned long idx, idx_next;
......@@ -623,7 +623,7 @@ tracing_get_trace_entry(struct trace_array *tr, struct trace_array_cpu *data)
return entry;
}
static inline notrace void
static inline void
tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags)
{
struct task_struct *tsk = current;
......@@ -640,7 +640,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags)
(need_resched() ? TRACE_FLAG_NEED_RESCHED : 0);
}
notrace void
void
trace_function(struct trace_array *tr, struct trace_array_cpu *data,
unsigned long ip, unsigned long parent_ip, unsigned long flags)
{
......@@ -659,7 +659,7 @@ trace_function(struct trace_array *tr, struct trace_array_cpu *data,
wake_up (&trace_wait);
}
notrace void
void
ftrace(struct trace_array *tr, struct trace_array_cpu *data,
unsigned long ip, unsigned long parent_ip, unsigned long flags)
{
......@@ -667,7 +667,7 @@ ftrace(struct trace_array *tr, struct trace_array_cpu *data,
trace_function(tr, data, ip, parent_ip, flags);
}
notrace void
void
trace_special(struct trace_array *tr, struct trace_array_cpu *data,
unsigned long arg1, unsigned long arg2, unsigned long arg3)
{
......@@ -687,7 +687,7 @@ trace_special(struct trace_array *tr, struct trace_array_cpu *data,
wake_up (&trace_wait);
}
notrace void
void
tracing_sched_switch_trace(struct trace_array *tr,
struct trace_array_cpu *data,
struct task_struct *prev, struct task_struct *next,
......@@ -712,7 +712,7 @@ tracing_sched_switch_trace(struct trace_array *tr,
}
#ifdef CONFIG_FTRACE
static notrace void
static void
function_trace_call(unsigned long ip, unsigned long parent_ip)
{
struct trace_array *tr = &global_trace;
......@@ -741,12 +741,12 @@ static struct ftrace_ops trace_ops __read_mostly =
.func = function_trace_call,
};
notrace void tracing_start_function_trace(void)
void tracing_start_function_trace(void)
{
register_ftrace_function(&trace_ops);
}
notrace void tracing_stop_function_trace(void)
void tracing_stop_function_trace(void)
{
unregister_ftrace_function(&trace_ops);
}
......@@ -786,7 +786,7 @@ trace_entry_idx(struct trace_array *tr, struct trace_array_cpu *data,
return &array[iter->next_page_idx[cpu]];
}
static struct trace_entry * notrace
static struct trace_entry *
find_next_entry(struct trace_iterator *iter, int *ent_cpu)
{
struct trace_array *tr = iter->tr;
......@@ -813,7 +813,7 @@ find_next_entry(struct trace_iterator *iter, int *ent_cpu)
return next;
}
static notrace void trace_iterator_increment(struct trace_iterator *iter)
static void trace_iterator_increment(struct trace_iterator *iter)
{
iter->idx++;
iter->next_idx[iter->cpu]++;
......@@ -828,7 +828,7 @@ static notrace void trace_iterator_increment(struct trace_iterator *iter)
}
}
static notrace void trace_consume(struct trace_iterator *iter)
static void trace_consume(struct trace_iterator *iter)
{
struct trace_array_cpu *data = iter->tr->data[iter->cpu];
......@@ -844,7 +844,7 @@ static notrace void trace_consume(struct trace_iterator *iter)
data->trace_idx = 0;
}
static notrace void *find_next_entry_inc(struct trace_iterator *iter)
static void *find_next_entry_inc(struct trace_iterator *iter)
{
struct trace_entry *next;
int next_cpu = -1;
......@@ -863,7 +863,7 @@ static notrace void *find_next_entry_inc(struct trace_iterator *iter)
return next ? iter : NULL;
}
static notrace void *s_next(struct seq_file *m, void *v, loff_t *pos)
static void *s_next(struct seq_file *m, void *v, loff_t *pos)
{
struct trace_iterator *iter = m->private;
void *last_ent = iter->ent;
......@@ -978,7 +978,7 @@ seq_print_sym_offset(struct trace_seq *s, const char *fmt,
# define IP_FMT "%016lx"
#endif
static notrace int
static int
seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags)
{
int ret;
......@@ -999,7 +999,7 @@ seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags)
return ret;
}
static notrace void print_lat_help_header(struct seq_file *m)
static void print_lat_help_header(struct seq_file *m)
{
seq_puts(m, "# _------=> CPU# \n");
seq_puts(m, "# / _-----=> irqs-off \n");
......@@ -1012,14 +1012,14 @@ static notrace void print_lat_help_header(struct seq_file *m)
seq_puts(m, "# \\ / ||||| \\ | / \n");
}
static notrace void print_func_help_header(struct seq_file *m)
static void print_func_help_header(struct seq_file *m)
{
seq_puts(m, "# TASK-PID CPU# TIMESTAMP FUNCTION\n");
seq_puts(m, "# | | | | |\n");
}
static notrace void
static void
print_trace_header(struct seq_file *m, struct trace_iterator *iter)
{
unsigned long sym_flags = (trace_flags & TRACE_ITER_SYM_MASK);
......@@ -1090,7 +1090,7 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
seq_puts(m, "\n");
}
static notrace void
static void
lat_print_generic(struct trace_seq *s, struct trace_entry *entry, int cpu)
{
int hardirq, softirq;
......@@ -1127,7 +1127,7 @@ lat_print_generic(struct trace_seq *s, struct trace_entry *entry, int cpu)
unsigned long preempt_mark_thresh = 100;
static notrace void
static void
lat_print_timestamp(struct trace_seq *s, unsigned long long abs_usecs,
unsigned long rel_usecs)
{
......@@ -1142,7 +1142,7 @@ lat_print_timestamp(struct trace_seq *s, unsigned long long abs_usecs,
static const char state_to_char[] = TASK_STATE_TO_CHAR_STR;
static notrace int
static int
print_lat_fmt(struct trace_iterator *iter, unsigned int trace_idx, int cpu)
{
struct trace_seq *s = &iter->seq;
......@@ -1206,7 +1206,7 @@ print_lat_fmt(struct trace_iterator *iter, unsigned int trace_idx, int cpu)
return 1;
}
static notrace int print_trace_fmt(struct trace_iterator *iter)
static int print_trace_fmt(struct trace_iterator *iter)
{
struct trace_seq *s = &iter->seq;
unsigned long sym_flags = (trace_flags & TRACE_ITER_SYM_MASK);
......@@ -1279,7 +1279,7 @@ static notrace int print_trace_fmt(struct trace_iterator *iter)
return 1;
}
static notrace int print_raw_fmt(struct trace_iterator *iter)
static int print_raw_fmt(struct trace_iterator *iter)
{
struct trace_seq *s = &iter->seq;
struct trace_entry *entry;
......@@ -1336,7 +1336,7 @@ do { \
return 0; \
} while (0)
static notrace int print_hex_fmt(struct trace_iterator *iter)
static int print_hex_fmt(struct trace_iterator *iter)
{
struct trace_seq *s = &iter->seq;
unsigned char newline = '\n';
......@@ -1375,7 +1375,7 @@ static notrace int print_hex_fmt(struct trace_iterator *iter)
return 1;
}
static notrace int print_bin_fmt(struct trace_iterator *iter)
static int print_bin_fmt(struct trace_iterator *iter)
{
struct trace_seq *s = &iter->seq;
struct trace_entry *entry;
......@@ -1475,7 +1475,7 @@ static struct seq_operations tracer_seq_ops = {
.show = s_show,