Merge branch 'core/xen' into x86/xen

2008-09-10 14:05:45 +02:00
parent 26fd10517e f7d0b926ac
commit 3ce9bcb583
941 changed files with 33672 additions and 9943 deletions
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -746,7 +746,7 @@ static spinlock_t *xen_pte_lock(struct page *page)
 {
 	spinlock_t *ptl = NULL;

-#if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS
+#if USE_SPLIT_PTLOCKS
 	ptl = __pte_lockptr(page);
 	spin_lock(ptl);
 #endif