[patch 39/43] rename try_to_del_ktimeout_sync() toktimeout_try_to_del_sync()

[Thomas Gleixner]

plain text document attachment
(ktimeout-rename-ktimeout_try_to_del_sync.patch)
- rename try_to_del_ktimeout_sync() to ktimeout_try_to_del_sync()

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

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

Index: linux/include/linux/ktimeout.h
===================================================================
--- linux.orig/include/linux/ktimeout.h
+++ linux/include/linux/ktimeout.h
@@ -88,10 +88,10 @@ static inline void ktimeout_add(struct k
 }
 
 #ifdef CONFIG_SMP
-  extern int try_to_del_ktimeout_sync(struct ktimeout *ktimeout);
+  extern int ktimeout_try_to_del_sync(struct ktimeout *ktimeout);
   extern int del_ktimeout_sync(struct ktimeout *ktimeout);
 #else
-# define try_to_del_ktimeout_sync(t)	ktimeout_del(t)
+# define ktimeout_try_to_del_sync(t)	ktimeout_del(t)
 # define del_ktimeout_sync(t)		ktimeout_del(t)
 #endif
 
Index: linux/include/linux/timer.h
===================================================================
--- linux.orig/include/linux/timer.h
+++ linux/include/linux/timer.h
@@ -25,7 +25,7 @@
 #define mod_timer			ktimeout_mod
 #define next_timer_interrupt		ktimeout_next_interrupt
 #define add_timer			ktimeout_add
-#define try_to_del_timer_sync		try_to_del_ktimeout_sync
+#define try_to_del_timer_sync		ktimeout_try_to_del_sync
 #define del_timer_sync			del_ktimeout_sync
 #define del_singleshot_timer_sync	del_singleshot_ktimeout_sync
 #define init_timers			init_ktimeouts
Index: linux/kernel/ktimeout.c
===================================================================
--- linux.orig/kernel/ktimeout.c
+++ linux/kernel/ktimeout.c
@@ -330,7 +330,7 @@ EXPORT_SYMBOL(ktimeout_del);
  *
  * It must not be called from interrupt contexts.
  */
-int try_to_del_ktimeout_sync(struct ktimeout *ktimeout)
+int ktimeout_try_to_del_sync(struct ktimeout *ktimeout)
 {
 	ktimeout_base_t *base;
 	unsigned long flags;
@@ -372,7 +372,7 @@ out:
 int del_ktimeout_sync(struct ktimeout *ktimeout)
 {
 	for (;;) {
-		int ret = try_to_del_ktimeout_sync(ktimeout);
+		int ret = ktimeout_try_to_del_sync(ktimeout);
 		if (ret >= 0)
 			return ret;
 	}

--

-
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/