From: Andrew Morton <akpm@osdl.org>

Cc: Ingo Molnar <mingo@elte.hu>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/audit.h       |    3 ++-
 kernel/auditfilter.c |   10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff -puN kernel/auditfilter.c~sem2mutex-audit_netlink_sem-fix kernel/auditfilter.c
--- devel/kernel/auditfilter.c~sem2mutex-audit_netlink_sem-fix	2006-01-13 21:53:56.000000000 -0800
+++ devel-akpm/kernel/auditfilter.c	2006-01-13 21:53:56.000000000 -0800
@@ -97,7 +97,7 @@ static int audit_compare_rule(struct aud
 
 /* Note that audit_add_rule and audit_del_rule are called via
  * audit_receive() in audit.c, and are protected by
- * audit_netlink_sem. */
+ * audit_netlink_mutex. */
 static inline int audit_add_rule(struct audit_rule *rule,
 				  struct list_head *list)
 {
@@ -146,7 +146,7 @@ static inline void audit_free_rule(struc
 
 /* Note that audit_add_rule and audit_del_rule are called via
  * audit_receive() in audit.c, and are protected by
- * audit_netlink_sem. */
+ * audit_netlink_mutex. */
 static inline int audit_del_rule(struct audit_rule *rule,
 				 struct list_head *list)
 {
@@ -175,10 +175,10 @@ static int audit_list_rules(void *_dest)
 	seq = dest[1];
 	kfree(dest);
 
-	down(&audit_netlink_sem);
+	mutex_lock(&audit_netlink_mutex);
 
 	/* The *_rcu iterators not needed here because we are
-	   always called with audit_netlink_sem held. */
+	   always called with audit_netlink_mutex held. */
 	for (i=0; i<AUDIT_NR_FILTERS; i++) {
 		list_for_each_entry(entry, &audit_filter_list[i], list)
 			audit_send_reply(pid, seq, AUDIT_LIST, 0, 1,
@@ -186,7 +186,7 @@ static int audit_list_rules(void *_dest)
 	}
 	audit_send_reply(pid, seq, AUDIT_LIST, 1, 1, NULL, 0);
 	
-	up(&audit_netlink_sem);
+	mutex_unlock(&audit_netlink_mutex);
 	return 0;
 }
 
diff -puN kernel/audit.h~sem2mutex-audit_netlink_sem-fix kernel/audit.h
--- devel/kernel/audit.h~sem2mutex-audit_netlink_sem-fix	2006-01-13 21:53:56.000000000 -0800
+++ devel-akpm/kernel/audit.h	2006-01-13 21:53:56.000000000 -0800
@@ -19,6 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <linux/mutex.h>
 #include <linux/fs.h>
 #include <linux/audit.h>
 
@@ -67,4 +68,4 @@ extern void		    audit_send_reply(int pi
 					     void *payload, int size);
 extern void		    audit_log_lost(const char *message);
 extern void		    audit_panic(const char *message);
-extern struct semaphore audit_netlink_sem;
+extern struct mutex audit_netlink_mutex;
_