plain text document attachment (ktimeout-rename-__ktimeout_mod.patch)
- rename __mod_ktimeout() to __mod_ktimeout()
Signed-off-by: Ingo Molnar <[email protected]>
include/linux/ktimeout.h | 4 ++--
include/linux/timer.h | 2 +-
kernel/ktimeout.c | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
Index: linux/include/linux/ktimeout.h
===================================================================
--- linux.orig/include/linux/ktimeout.h
+++ linux/include/linux/ktimeout.h
@@ -62,7 +62,7 @@ static inline int ktimeout_pending(const
extern void ktimeout_add_on(struct ktimeout *ktimeout, int cpu);
extern int ktimeout_del(struct ktimeout * ktimeout);
-extern int __mod_ktimeout(struct ktimeout *ktimeout, unsigned long expires);
+extern int __ktimeout_mod(struct ktimeout *ktimeout, unsigned long expires);
extern int mod_ktimeout(struct ktimeout *ktimeout, unsigned long expires);
extern unsigned long next_ktimeout_interrupt(void);
@@ -84,7 +84,7 @@ extern unsigned long next_ktimeout_inter
static inline void add_ktimeout(struct ktimeout *ktimeout)
{
BUG_ON(ktimeout_pending(ktimeout));
- __mod_ktimeout(ktimeout, ktimeout->expires);
+ __ktimeout_mod(ktimeout, ktimeout->expires);
}
#ifdef CONFIG_SMP
Index: linux/include/linux/timer.h
===================================================================
--- linux.orig/include/linux/timer.h
+++ linux/include/linux/timer.h
@@ -21,7 +21,7 @@
#define timer_pending ktimeout_pending
#define add_timer_on ktimeout_add_on
#define del_timer ktimeout_del
-#define __mod_timer __mod_ktimeout
+#define __mod_timer __ktimeout_mod
#define mod_timer mod_ktimeout
#define next_timer_interrupt next_ktimeout_interrupt
#define add_timer add_ktimeout
Index: linux/kernel/ktimeout.c
===================================================================
--- linux.orig/kernel/ktimeout.c
+++ linux/kernel/ktimeout.c
@@ -189,7 +189,7 @@ static ktimeout_base_t *lock_ktimeout_ba
}
}
-int __mod_ktimeout(struct ktimeout *ktimeout, unsigned long expires)
+int __ktimeout_mod(struct ktimeout *ktimeout, unsigned long expires)
{
ktimeout_base_t *base;
tvec_base_t *new_base;
@@ -234,7 +234,7 @@ int __mod_ktimeout(struct ktimeout *ktim
return ret;
}
-EXPORT_SYMBOL(__mod_ktimeout);
+EXPORT_SYMBOL(__ktimeout_mod);
/***
* ktimeout_add_on - start a timeout on a particular CPU
@@ -287,7 +287,7 @@ int mod_ktimeout(struct ktimeout *ktimeo
if (ktimeout->expires == expires && ktimeout_pending(ktimeout))
return 1;
- return __mod_ktimeout(ktimeout, expires);
+ return __ktimeout_mod(ktimeout, expires);
}
EXPORT_SYMBOL(mod_ktimeout);
@@ -622,7 +622,7 @@ fastcall signed long __sched schedule_ti
expire = timeout + jiffies;
ktimeout_setup(&ktimeout, process_timeout, (unsigned long)current);
- __mod_ktimeout(&ktimeout, expire);
+ __ktimeout_mod(&ktimeout, expire);
schedule();
del_singleshot_ktimeout_sync(&ktimeout);
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
