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

Commit 910e94dd authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/core' of git://github.com/rostedt/linux into perf/core

parents 177e2163 d696b58c

arch/x86/kernel/jump_label.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void arch_jump_label_transform(struct jump_entry *entry, 
	put_online_cpus();

}



void arch_jump_label_text_poke_early(jump_label_t addr)

void __init_or_module arch_jump_label_text_poke_early(jump_label_t addr)

{

	text_poke_early((void *)addr, ideal_nops[NOP_ATOMIC5],

			JUMP_LABEL_NOP_SIZE);

include/linux/module.h

+0 −12
Original line number Diff line number Diff line
@@ -580,9 +580,6 @@ int unregister_module_notifier(struct notifier_block * nb); 


extern void print_modules(void);



extern void module_update_tracepoints(void);

extern int module_get_iter_tracepoints(struct tracepoint_iter *iter);



#else /* !CONFIG_MODULES... */

#define EXPORT_SYMBOL(sym)

#define EXPORT_SYMBOL_GPL(sym)
@@ -698,15 +695,6 @@ static inline int unregister_module_notifier(struct notifier_block * nb) 
static inline void print_modules(void)

{

}



static inline void module_update_tracepoints(void)

{

}



static inline int module_get_iter_tracepoints(struct tracepoint_iter *iter)

{

	return 0;

}

#endif /* CONFIG_MODULES */



#ifdef CONFIG_SYSFS

include/linux/ring_buffer.h

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ void ring_buffer_record_enable(struct ring_buffer *buffer); 
void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu);

void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu);



unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_bytes_cpu(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_entries(struct ring_buffer *buffer);

unsigned long ring_buffer_overruns(struct ring_buffer *buffer);

unsigned long ring_buffer_entries_cpu(struct ring_buffer *buffer, int cpu);

include/linux/trace_clock.h

+1 −0
Original line number Diff line number Diff line
@@ -15,5 +15,6 @@ 
extern u64 notrace trace_clock_local(void);

extern u64 notrace trace_clock(void);

extern u64 notrace trace_clock_global(void);

extern u64 notrace trace_clock_counter(void);



#endif /* _LINUX_TRACE_CLOCK_H */

include/linux/tracepoint.h

+11 −14
Original line number Diff line number Diff line
@@ -54,8 +54,18 @@ extern int tracepoint_probe_unregister_noupdate(const char *name, void *probe, 
						void *data);

extern void tracepoint_probe_update_all(void);



#ifdef CONFIG_MODULES

struct tp_module {

	struct list_head list;

	unsigned int num_tracepoints;

	struct tracepoint * const *tracepoints_ptrs;

};

#endif /* CONFIG_MODULES */



struct tracepoint_iter {

	struct module *module;

#ifdef CONFIG_MODULES

	struct tp_module *module;

#endif /* CONFIG_MODULES */

	struct tracepoint * const *tracepoint;

};
@@ -63,8 +73,6 @@ extern void tracepoint_iter_start(struct tracepoint_iter *iter); 
extern void tracepoint_iter_next(struct tracepoint_iter *iter);

extern void tracepoint_iter_stop(struct tracepoint_iter *iter);

extern void tracepoint_iter_reset(struct tracepoint_iter *iter);

extern int tracepoint_get_iter_range(struct tracepoint * const **tracepoint,

	struct tracepoint * const *begin, struct tracepoint * const *end);



/*

 * tracepoint_synchronize_unregister must be called between the last tracepoint
@@ -78,17 +86,6 @@ static inline void tracepoint_synchronize_unregister(void) 


#define PARAMS(args...) args



#ifdef CONFIG_TRACEPOINTS

extern

void tracepoint_update_probe_range(struct tracepoint * const *begin,

	struct tracepoint * const *end);

#else

static inline

void tracepoint_update_probe_range(struct tracepoint * const *begin,

	struct tracepoint * const *end)

{ }

#endif /* CONFIG_TRACEPOINTS */



#endif /* _LINUX_TRACEPOINT_H */



/*