From ea938e06b8c2c4681abfa9406d700f39b429465f Mon Sep 17 00:00:00 2001 From: Suresh Siddha Date: Tue, 13 Jan 2009 10:21:30 -0800 Subject: [PATCH] --- yaml --- r: 129964 b: refs/heads/master c: 9597134218300c045cf219be3664615e97cb239c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/pat.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 35681c004beb..a7f2f5033a8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 731f1872f4e8a0f1eabd49c3548207e79a421202 +refs/heads/master: 9597134218300c045cf219be3664615e97cb239c diff --git a/trunk/arch/x86/mm/pat.c b/trunk/arch/x86/mm/pat.c index 070ee4a3b225..ffc88cc00fda 100644 --- a/trunk/arch/x86/mm/pat.c +++ b/trunk/arch/x86/mm/pat.c @@ -333,6 +333,9 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, req_type & _PAGE_CACHE_MASK); } + if (new_type) + *new_type = actual_type; + /* * For legacy reasons, some parts of the physical address range in the * legacy 1MB region is treated as non-RAM (even when listed as RAM in @@ -356,9 +359,6 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, new->end = end; new->type = actual_type; - if (new_type) - *new_type = actual_type; - spin_lock(&memtype_lock); if (cached_entry && start >= cached_start)