[patch 41/43] rename del_singleshot_ktimeout_sync() toktimeout_del_singleshot_sync()

[Thomas Gleixner]

plain text document attachment
(ktimeout-rename-ktimeout_del_singleshot_sync.patch)
- rename del_singleshot_ktimeout_sync() to ktimeout_del_singleshot_sync()

Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

 include/linux/ktimeout.h |    2 +-
 include/linux/timer.h    |    2 +-
 kernel/ktimeout.c        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: linux/include/linux/ktimeout.h
===================================================================
--- linux.orig/include/linux/ktimeout.h
+++ linux/include/linux/ktimeout.h
@@ -95,7 +95,7 @@ static inline void ktimeout_add(struct k
 # define ktimeout_del_sync(t)		ktimeout_del(t)
 #endif
 
-#define del_singleshot_ktimeout_sync(t) ktimeout_del_sync(t)
+#define ktimeout_del_singleshot_sync(t) ktimeout_del_sync(t)
 
 extern void init_ktimeouts(void);
 extern void run_local_ktimeouts(void);
Index: linux/include/linux/timer.h
===================================================================
--- linux.orig/include/linux/timer.h
+++ linux/include/linux/timer.h
@@ -27,7 +27,7 @@
 #define add_timer			ktimeout_add
 #define try_to_del_timer_sync		ktimeout_try_to_del_sync
 #define del_timer_sync			ktimeout_del_sync
-#define del_singleshot_timer_sync	del_singleshot_ktimeout_sync
+#define del_singleshot_timer_sync	ktimeout_del_singleshot_sync
 #define init_timers			init_ktimeouts
 #define run_local_timers		run_local_ktimeouts
 
Index: linux/kernel/ktimeout.c
===================================================================
--- linux.orig/kernel/ktimeout.c
+++ linux/kernel/ktimeout.c
@@ -624,7 +624,7 @@ fastcall signed long __sched schedule_ti
 	ktimeout_setup(&ktimeout, process_timeout, (unsigned long)current);
 	__ktimeout_mod(&ktimeout, expire);
 	schedule();
-	del_singleshot_ktimeout_sync(&ktimeout);
+	ktimeout_del_singleshot_sync(&ktimeout);
 
 	timeout = expire - jiffies;
 

--

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/