1 files changed, 0 insertions, 51 deletions

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 10277429ed84..2c3382378d94 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -573,57 +573,6 @@ void tasklet_kill(struct tasklet_struct *t)
 }
 EXPORT_SYMBOL(tasklet_kill);
 
-/*
- * tasklet_hrtimer
- */
-
-/*
- * The trampoline is called when the hrtimer expires. It schedules a tasklet
- * to run __tasklet_hrtimer_trampoline() which in turn will call the intended
- * hrtimer callback, but from softirq context.
- */
-static enum hrtimer_restart __hrtimer_tasklet_trampoline(struct hrtimer *timer)
-{
-        struct tasklet_hrtimer *ttimer =
-                container_of(timer, struct tasklet_hrtimer, timer);
-
-        tasklet_hi_schedule(&ttimer->tasklet);
-        return HRTIMER_NORESTART;
-}
-
-/*
- * Helper function which calls the hrtimer callback from
- * tasklet/softirq context
- */
-static void __tasklet_hrtimer_trampoline(unsigned long data)
-{
-        struct tasklet_hrtimer *ttimer = (void *)data;
-        enum hrtimer_restart restart;
-
-        restart = ttimer->function(&ttimer->timer);
-        if (restart != HRTIMER_NORESTART)
-                hrtimer_restart(&ttimer->timer);
-}
-
-/**
- * tasklet_hrtimer_init - Init a tasklet/hrtimer combo for softirq callbacks
- * @ttimer:      tasklet_hrtimer which is initialized
- * @function:    hrtimer callback function which gets called from softirq context
- * @which_clock: clock id (CLOCK_MONOTONIC/CLOCK_REALTIME)
- * @mode:        hrtimer mode (HRTIMER_MODE_ABS/HRTIMER_MODE_REL)
- */
-void tasklet_hrtimer_init(struct tasklet_hrtimer *ttimer,
-                          enum hrtimer_restart (*function)(struct hrtimer *),
-                          clockid_t which_clock, enum hrtimer_mode mode)
-{
-        hrtimer_init(&ttimer->timer, which_clock, mode);
-        ttimer->timer.function = __hrtimer_tasklet_trampoline;
-        tasklet_init(&ttimer->tasklet, __tasklet_hrtimer_trampoline,
-                     (unsigned long)ttimer);
-        ttimer->function = function;
-}
-EXPORT_SYMBOL_GPL(tasklet_hrtimer_init);
-
 void __init softirq_init(void)
 {
         int cpu;