From 1f17bd17bdca5142390dc31493db7c47182a3883 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Tue, 27 Jun 2006 02:53:54 -0700
Subject: [PATCH] --- yaml --- r: 30747 b: refs/heads/master c:
 a7807a32bbb027ab9955b96734fdc7f1e6497a9f h: refs/heads/master i:   30745:
 5c42147239a6a4ce65845c2ff7a8ab08df25fabb   30743:
 31f9214090901348d674f9950312f5075eca8051 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/poison.h | 7 +++++++
 trunk/kernel/mutex-debug.c   | 5 +++--
 trunk/security/keys/key.c    | 3 ++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3fafa992f6fa..ce5db403e470 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3c681e09193559ba15f6c9562bd37045f120a96
+refs/heads/master: a7807a32bbb027ab9955b96734fdc7f1e6497a9f
diff --git a/trunk/include/linux/poison.h b/trunk/include/linux/poison.h
index 4109f37b7b66..a5347c02432e 100644
--- a/trunk/include/linux/poison.h
+++ b/trunk/include/linux/poison.h
@@ -45,6 +45,13 @@
 /********** drivers/atm/ **********/
 #define ATM_POISON_FREE		0x12
 
+/********** kernel/mutexes **********/
+#define MUTEX_DEBUG_INIT	0x11
+#define MUTEX_DEBUG_FREE	0x22
+
+/********** security/ **********/
+#define KEY_DESTROY		0xbd
+
 /********** sound/oss/ **********/
 #define OSS_POISON_FREE		0xAB
 
diff --git a/trunk/kernel/mutex-debug.c b/trunk/kernel/mutex-debug.c
index 036b6285b15c..e38e4bac97ca 100644
--- a/trunk/kernel/mutex-debug.c
+++ b/trunk/kernel/mutex-debug.c
@@ -16,6 +16,7 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/poison.h>
 #include <linux/spinlock.h>
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>
@@ -381,7 +382,7 @@ void debug_mutex_set_owner(struct mutex *lock,
 
 void debug_mutex_init_waiter(struct mutex_waiter *waiter)
 {
-	memset(waiter, 0x11, sizeof(*waiter));
+	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
 	waiter->magic = waiter;
 	INIT_LIST_HEAD(&waiter->list);
 }
@@ -397,7 +398,7 @@ void debug_mutex_wake_waiter(struct mutex *lock, struct mutex_waiter *waiter)
 void debug_mutex_free_waiter(struct mutex_waiter *waiter)
 {
 	DEBUG_WARN_ON(!list_empty(&waiter->list));
-	memset(waiter, 0x22, sizeof(*waiter));
+	memset(waiter, MUTEX_DEBUG_FREE, sizeof(*waiter));
 }
 
 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
diff --git a/trunk/security/keys/key.c b/trunk/security/keys/key.c
index 43295ca37b5d..80de8c3e9cc3 100644
--- a/trunk/security/keys/key.c
+++ b/trunk/security/keys/key.c
@@ -11,6 +11,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/poison.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/security.h>
@@ -988,7 +989,7 @@ void unregister_key_type(struct key_type *ktype)
 		if (key->type == ktype) {
 			if (ktype->destroy)
 				ktype->destroy(key);
-			memset(&key->payload, 0xbd, sizeof(key->payload));
+			memset(&key->payload, KEY_DESTROY, sizeof(key->payload));
 		}
 	}