mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
s390: cmm: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Martin Schwidefsky <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Paul Gortmaker <[email protected]> Cc: [email protected] Signed-off-by: Kees Cook <[email protected]>
This commit is contained in:
parent
87c1d2d373
commit
6cc73a06da
1 changed files with 3 additions and 5 deletions
|
|
@ -56,10 +56,10 @@ static DEFINE_SPINLOCK(cmm_lock);
|
|||
|
||||
static struct task_struct *cmm_thread_ptr;
|
||||
static DECLARE_WAIT_QUEUE_HEAD(cmm_thread_wait);
|
||||
static DEFINE_TIMER(cmm_timer, NULL);
|
||||
|
||||
static void cmm_timer_fn(unsigned long);
|
||||
static void cmm_timer_fn(struct timer_list *);
|
||||
static void cmm_set_timer(void);
|
||||
static DEFINE_TIMER(cmm_timer, cmm_timer_fn);
|
||||
|
||||
static long cmm_alloc_pages(long nr, long *counter,
|
||||
struct cmm_page_array **list)
|
||||
|
|
@ -194,13 +194,11 @@ static void cmm_set_timer(void)
|
|||
if (mod_timer(&cmm_timer, jiffies + cmm_timeout_seconds*HZ))
|
||||
return;
|
||||
}
|
||||
cmm_timer.function = cmm_timer_fn;
|
||||
cmm_timer.data = 0;
|
||||
cmm_timer.expires = jiffies + cmm_timeout_seconds*HZ;
|
||||
add_timer(&cmm_timer);
|
||||
}
|
||||
|
||||
static void cmm_timer_fn(unsigned long ignored)
|
||||
static void cmm_timer_fn(struct timer_list *unused)
|
||||
{
|
||||
long nr;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue