From c76be11c906fe55b254857be34342a9cc971ddc3 Mon Sep 17 00:00:00 2001 From: Venkatesh Pallipadi Date: Thu, 10 Jun 2010 17:45:01 -0700 Subject: [PATCH] --- yaml --- r: 200589 b: refs/heads/master c: 6a4f3b523779b67e7d560ed42652f8a59f2f9782 h: refs/heads/master i: 200587: 618f79bd1682f79f48376026c195c12bcfe982aa v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/pat.c | 2 +- trunk/arch/x86/mm/pat_rbtree.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6f74391a4f5e..8c2a34bfab77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 055c47272b8f5679d08ccc57efea3cb4aaeb5fc6 +refs/heads/master: 6a4f3b523779b67e7d560ed42652f8a59f2f9782 diff --git a/trunk/arch/x86/mm/pat.c b/trunk/arch/x86/mm/pat.c index acc15b23b743..64121a18b8cb 100644 --- a/trunk/arch/x86/mm/pat.c +++ b/trunk/arch/x86/mm/pat.c @@ -302,7 +302,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, return -EINVAL; } - new = kmalloc(sizeof(struct memtype), GFP_KERNEL); + new = kzalloc(sizeof(struct memtype), GFP_KERNEL); if (!new) return -ENOMEM; diff --git a/trunk/arch/x86/mm/pat_rbtree.c b/trunk/arch/x86/mm/pat_rbtree.c index f537087bb740..f20eeec85a86 100644 --- a/trunk/arch/x86/mm/pat_rbtree.c +++ b/trunk/arch/x86/mm/pat_rbtree.c @@ -226,6 +226,7 @@ int rbt_memtype_check_insert(struct memtype *new, unsigned long *ret_type) if (ret_type) new->type = *ret_type; + new->subtree_max_end = new->end; memtype_rb_insert(&memtype_rbroot, new); } return err;