From: Dave McCracken <dave.mccracken@oracle.com>
Date: Thu, 15 Mar 2012 00:37:45 +0000 (-0700)
Subject: xen: make page table walk hugepages aware
X-Git-Tag: v2.6.39-400.9.0~591
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9251b5be3b7942a361e7dbe331986fc2facd82af;p=users%2Fjedix%2Flinux-maple.git

xen: make page table walk hugepages aware

Orabug: 13719997
Fix problem in Xen pvhugepages where page table walk to lock/unlock
page table pages needed to be taught about hugepages.

Signed-off-by: Dave McCracken <dave.mccracken@oracle.com>
Signed-off-by: Guru Anbalagane <guru.anbalagane@oracle.com>
---

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index c85780a43f5b7..1f950a4a7617a 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -47,6 +47,7 @@
 #include <linux/gfp.h>
 #include <linux/memblock.h>
 #include <linux/seq_file.h>
+#include <linux/hugetlb.h>
 
 #include <trace/events/xen.h>
 
@@ -749,6 +750,9 @@ static int __xen_pgd_walk(struct mm_struct *mm, pgd_t *pgd,
 				if (pmd_none(pmd[pmdidx]))
 					continue;
 
+				if (pmd_huge(pmd[pmdidx]))
+					continue;
+
 				pte = pmd_page(pmd[pmdidx]);
 				flush |= (*func)(mm, pte, PT_PTE);
 			}