diff --git a/arch/x86/mm/pgtable_32-xen.c b/arch/x86/mm/pgtable_32-xen.c
index 49e28e7..d8bc211 100644
--- a/arch/x86/mm/pgtable_32-xen.c
+++ b/arch/x86/mm/pgtable_32-xen.c
@@ -290,15 +290,20 @@ static void pgd_ctor(void *pgd)
 
 static void pgd_dtor(void *pgd)
 {
+#ifndef CONFIG_XEN
 	unsigned long flags; /* can be called from interrupt context */
+#endif
 
 	if (SHARED_KERNEL_PMD)
 		return;
 
+#ifndef CONFIG_XEN
+	/* This is done in pgd_free in the Xen case. */
 	paravirt_release_pd(__pa(pgd) >> PAGE_SHIFT);
 	spin_lock_irqsave(&pgd_lock, flags);
 	pgd_list_del(pgd);
 	spin_unlock_irqrestore(&pgd_lock, flags);
+#endif
 
 	pgd_test_and_unpin(pgd);
 }