From 0237a7b0f76481306c2b6ff1b1e03648c6c973eb Mon Sep 17 00:00:00 2001
From: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>
Date: Wed, 24 Feb 2010 13:43:55 -0800
Subject: [PATCH] --- yaml --- r: 191546 b: refs/heads/master c:
 4daa2a8093ecd1148270a1fc64e99f072b8c2901 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/mm/pat_rbtree.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b4c8e82bbd29..f4f079592308 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e41a49aab88a5a6c8f4875bf10a5543bc321f2d
+refs/heads/master: 4daa2a8093ecd1148270a1fc64e99f072b8c2901
diff --git a/trunk/arch/x86/mm/pat_rbtree.c b/trunk/arch/x86/mm/pat_rbtree.c
index 9063f40b638b..07de4cb8cc30 100644
--- a/trunk/arch/x86/mm/pat_rbtree.c
+++ b/trunk/arch/x86/mm/pat_rbtree.c
@@ -223,7 +223,9 @@ int rbt_memtype_check_insert(struct memtype *new, unsigned long *ret_type)
 						new->type, ret_type);
 
 	if (!err) {
-		new->type = *ret_type;
+		if (ret_type)
+			new->type = *ret_type;
+
 		memtype_rb_insert(&memtype_rbroot, new);
 	}
 	return err;