2 files changed, 6 insertions, 6 deletions

diff --git a/kernel/timer.c b/kernel/timer.c
index 9e49deed468c..3bf0e9ed2dbe 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -419,10 +419,10 @@ static inline void __run_timers(tvec_base_t *base)
 
         spin_lock_irq(&base->lock);
         while (time_after_eq(jiffies, base->timer_jiffies)) {
-                struct list_head work_list = LIST_HEAD_INIT(work_list);
+                struct list_head work_list;
                 struct list_head *head = &work_list;
                 int index = base->timer_jiffies & TVR_MASK;
- 
+
                 /*
                  * Cascade timers:
                  */
@@ -431,8 +431,8 @@ static inline void __run_timers(tvec_base_t *base)
                                 (!cascade(base, &base->tv3, INDEX(1))) &&
                                         !cascade(base, &base->tv4, INDEX(2)))
                         cascade(base, &base->tv5, INDEX(3));
-                ++base->timer_jiffies; 
-                list_splice_init(base->tv1.vec + index, &work_list);
+                ++base->timer_jiffies;
+                list_replace_init(base->tv1.vec + index, &work_list);
                 while (!list_empty(head)) {
                         void (*fn)(unsigned long);
                         unsigned long data;
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 880fb415a8f6..740c5abceb07 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -531,11 +531,11 @@ int current_is_keventd(void)
 static void take_over_work(struct workqueue_struct *wq, unsigned int cpu)
 {
         struct cpu_workqueue_struct *cwq = per_cpu_ptr(wq->cpu_wq, cpu);
-        LIST_HEAD(list);
+        struct list_head list;
         struct work_struct *work;
 
         spin_lock_irq(&cwq->lock);
-        list_splice_init(&cwq->worklist, &list);
+        list_replace_init(&cwq->worklist, &list);
 
         while (!list_empty(&list)) {
                 printk("Taking work for %s\n", wq->name);