diff --git a/[refs] b/[refs]
index 8d0d7c55650a..5ad128a691b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e66485d747505e9d960b864fc6c37f8b2afafaf0
+refs/heads/master: df912ea4ae7233d1504fbd861ee127bd7ee5781d
diff --git a/trunk/arch/i386/xen/mmu.c b/trunk/arch/i386/xen/mmu.c
index 4ae038aa6c24..874db0cd1d2a 100644
--- a/trunk/arch/i386/xen/mmu.c
+++ b/trunk/arch/i386/xen/mmu.c
@@ -559,6 +559,9 @@ void xen_exit_mmap(struct mm_struct *mm)
 	put_cpu();
 
 	spin_lock(&mm->page_table_lock);
-	xen_pgd_unpin(mm->pgd);
+
+	/* pgd may not be pinned in the error exit path of execve */
+	if (PagePinned(virt_to_page(mm->pgd)))
+		xen_pgd_unpin(mm->pgd);
 	spin_unlock(&mm->page_table_lock);
 }