Merge /spare/repo/linux-2.6/

3 files changed, 9 insertions, 13 deletions

diff --git a/net/core/dst.c b/net/core/dst.c
index 334790da9f16..470c05bc4cb2 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -39,8 +39,7 @@ static unsigned long dst_gc_timer_inc = DST_GC_MAX;
 static void dst_run_gc(unsigned long);
 static void ___dst_free(struct dst_entry * dst);
 
-static struct timer_list dst_gc_timer =
-        TIMER_INITIALIZER(dst_run_gc, DST_GC_MIN, 0);
+static DEFINE_TIMER(dst_gc_timer, dst_run_gc, DST_GC_MIN, 0);
 
 static void dst_run_gc(unsigned long dummy)
 {
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index a1a9a7abff50..5265dfd69928 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -645,10 +645,10 @@ int netpoll_setup(struct netpoll *np)
 
                 npinfo->rx_flags = 0;
                 npinfo->rx_np = NULL;
-                npinfo->poll_lock = SPIN_LOCK_UNLOCKED;
+                spin_lock_init(&npinfo->poll_lock);
                 npinfo->poll_owner = -1;
                 npinfo->tries = MAX_RETRIES;
-                npinfo->rx_lock = SPIN_LOCK_UNLOCKED;
+                spin_lock_init(&npinfo->rx_lock);
         } else
                 npinfo = ndev->npinfo;
 
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 8eb083b6041a..ef430b1e8e42 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -503,7 +503,7 @@ static int pg_delay_d = 0;
 static int pg_clone_skb_d = 0;
 static int debug = 0;
 
-static spinlock_t _thread_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(_thread_lock);
 static struct pktgen_thread *pktgen_threads = NULL;
 
 static char module_fname[128];
@@ -1452,8 +1452,7 @@ static int proc_thread_write(struct file *file, const char __user *user_buffer,
                 thread_lock();
                 t->control |= T_REMDEV;
                 thread_unlock();
-                current->state = TASK_INTERRUPTIBLE;
-                schedule_timeout(HZ/8);  /* Propagate thread->control  */
+                schedule_timeout_interruptible(msecs_to_jiffies(125));  /* Propagate thread->control  */
                 ret = count;
                 sprintf(pg_result, "OK: rem_device_all");
                 goto out;
@@ -1716,10 +1715,9 @@ static void spin(struct pktgen_dev *pkt_dev, __u64 spin_until_us)
         printk(KERN_INFO "sleeping for %d\n", (int)(spin_until_us - now));
         while (now < spin_until_us) {
                 /* TODO: optimise sleeping behavior */
-                if (spin_until_us - now > (1000000/HZ)+1) {
-                        current->state = TASK_INTERRUPTIBLE;
-                        schedule_timeout(1);
-                } else if (spin_until_us - now > 100) {
+                if (spin_until_us - now > jiffies_to_usecs(1)+1)
+                        schedule_timeout_interruptible(1);
+                else if (spin_until_us - now > 100) {
                         do_softirq();
                         if (!pkt_dev->running)
                                 return;
@@ -2449,8 +2447,7 @@ static void pktgen_run_all_threads(void)
         }
         thread_unlock();
 
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(HZ/8);  /* Propagate thread->control  */
+        schedule_timeout_interruptible(msecs_to_jiffies(125));  /* Propagate thread->control  */
                         
         pktgen_wait_all_threads_run();
 }