Commit ba6fdda4 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

profiling: Remove unused timer hook 



The last remaining user was oprofile and its use has been
removed a while ago in commit bc078e4e
("oprofile: convert oprofile from timer_hook to hrtimer").

There doesn't seem to be any upstream user of this hook
for about two years now. And I'm not even aware of any out of
tree user.

Let's remove it.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Alessio Igor Bogani <abogani@kernel.org>
Cc: Avi Kivity <avi@redhat.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Geoff Levand <geoff@infradead.org>
Cc: Gilad Ben Yossef <gilad@benyossef.com>
Cc: Hakan Akkan <hakanakkan@gmail.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1356191991-2251-1-git-send-email-fweisbec@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 7c3c867f

include/linux/profile.h

+0 −13
Original line number Diff line number Diff line
@@ -82,9 +82,6 @@ int task_handoff_unregister(struct notifier_block * n); 
int profile_event_register(enum profile_type, struct notifier_block * n);

int profile_event_unregister(enum profile_type, struct notifier_block * n);



int register_timer_hook(int (*hook)(struct pt_regs *));

void unregister_timer_hook(int (*hook)(struct pt_regs *));



struct pt_regs;



#else
@@ -135,16 +132,6 @@ static inline int profile_event_unregister(enum profile_type t, struct notifier_ 
#define profile_handoff_task(a) (0)

#define profile_munmap(a) do { } while (0)



static inline int register_timer_hook(int (*hook)(struct pt_regs *))

{

	return -ENOSYS;

}



static inline void unregister_timer_hook(int (*hook)(struct pt_regs *))

{

	return;

}



#endif /* CONFIG_PROFILING */



#endif /* _LINUX_PROFILE_H */

kernel/profile.c

+0 −24
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ struct profile_hit { 
#define NR_PROFILE_HIT		(PAGE_SIZE/sizeof(struct profile_hit))

#define NR_PROFILE_GRP		(NR_PROFILE_HIT/PROFILE_GRPSZ)



/* Oprofile timer tick hook */

static int (*timer_hook)(struct pt_regs *) __read_mostly;



static atomic_t *prof_buffer;

static unsigned long prof_len, prof_shift;
@@ -208,25 +205,6 @@ int profile_event_unregister(enum profile_type type, struct notifier_block *n) 
}

EXPORT_SYMBOL_GPL(profile_event_unregister);



int register_timer_hook(int (*hook)(struct pt_regs *))

{

	if (timer_hook)

		return -EBUSY;

	timer_hook = hook;

	return 0;

}

EXPORT_SYMBOL_GPL(register_timer_hook);



void unregister_timer_hook(int (*hook)(struct pt_regs *))

{

	WARN_ON(hook != timer_hook);

	timer_hook = NULL;

	/* make sure all CPUs see the NULL hook */

	synchronize_sched();  /* Allow ongoing interrupts to complete. */

}

EXPORT_SYMBOL_GPL(unregister_timer_hook);





#ifdef CONFIG_SMP

/*

 * Each cpu has a pair of open-addressed hashtables for pending
@@ -436,8 +414,6 @@ void profile_tick(int type) 
{

	struct pt_regs *regs = get_irq_regs();



	if (type == CPU_PROFILING && timer_hook)

		timer_hook(regs);

	if (!user_mode(regs) && prof_cpu_mask != NULL &&

	    cpumask_test_cpu(smp_processor_id(), prof_cpu_mask))

		profile_hit(type, (void *)profile_pc(regs));

CRA Git | Maintained and supported by SUSTech CRA and CCSE