[Xen-devel] [PATCH] 2.6.11-xen-sparse: missing CONFIG_SMP in pgtable-2level

Ryan Harper
Tue, 22 Mar 2005 22:15:38 -0000

The latest (20050322) xen-unstable fails to boot dom0 when CONFIG_SMP is
enabled.  The last working snapshot was from 2005-03-18.  I traced the
problem to a dropped #ifdef CONFIG_SMP in pgtable-2level.h

I''ve attached a debug trace of dom0 dying without the patch applied.

Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
(512) 838-9253   T/L: 678-9253
ryanh@us.ibm.com

diffstat output:

 pgtable-2level.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
---
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h
2005-03-21 22:39:28.000000000 -0600
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h
2005-03-22 15:55:40.000000000 -0600
@@ -13,8 +13,13 @@
  * within a page table are directly modified.  Thus, the following
  * hook is made available.
  */
+#ifdef CONFIG_SMP
+#define set_pte(pteptr, pteval) xen_l1_entry_update(pteptr, (pteval).pte_low)
+#else
 #define set_pte(pteptr, pteval) (*(pteptr) = pteval)
-#define set_pte_atomic(pteptr, pteval) set_pte(pteptr,pteval)
+#endif
+
+#define set_pte_atomic(pteptr, pteval) set_pte(pteptr, pteval)
 #define set_pmd(pmdptr, pmdval) xen_l2_entry_update((pmdptr), (pmdval))
 #define set_pte_batched(pteptr, pteval) \
 	queue_l1_entry_update(pteptr, (pteval).pte_low)