---

yaml --- r: 191546 b: refs/heads/master c: 4daa2a8 h: refs/heads/master v: v3
git-mirror · Mar 1, 2010 · 0237a7b · 0237a7b
1 parent 1a18bd2
commit 0237a7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;