From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 24 Mar 2006 04:44:19 +0000 (-0500)
Subject: Merge branch 'linus'
X-Git-Tag: v2.6.17-rc1~667^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ebbe2b20091d306453a5cf480a87e6cd28ae76f;p=linux-2.6

Merge branch 'linus'
---

1ebbe2b20091d306453a5cf480a87e6cd28ae76f
diff --cc net/sunrpc/sched.c
index 3fc13bea30,dff07795bd..b9969b91a9
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@@ -62,9 -63,9 +63,9 @@@ static LIST_HEAD(all_tasks)
  /*
   * rpciod-related stuff
   */
- static DECLARE_MUTEX(rpciod_sema);
+ static DEFINE_MUTEX(rpciod_mutex);
  static unsigned int		rpciod_users;
 -static struct workqueue_struct *rpciod_workqueue;
 +struct workqueue_struct *rpciod_workqueue;
  
  /*
   * Spinlock for other critical sections of code.