Revert "mac80211: use netif_receive_skb in ieee80211_tx_status callpath"

[net-next-2.6.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index ee305c8d4e18eb038a54f0f9aea8eb2f353b1f44..efde11e197c4d40f2abd8badd13459e159fdb5cb 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -577,6 +577,19 @@ static void __init_timer(struct timer_list *timer,
        lockdep_init_map(&timer->lockdep_map, name, key, 0);
 }
 
+void setup_deferrable_timer_on_stack_key(struct timer_list *timer,
+                                        const char *name,
+                                        struct lock_class_key *key,
+                                        void (*function)(unsigned long),
+                                        unsigned long data)
+{
+       timer->function = function;
+       timer->data = data;
+       init_timer_on_stack_key(timer, name, key);
+       timer_set_deferrable(timer);
+}
+EXPORT_SYMBOL_GPL(setup_deferrable_timer_on_stack_key);
+
 /**
  * init_timer_key - initialize a timer
  * @timer: the timer to be initialized