instead of putting it into the x86 tree i've split out the mm patch into
a separate, -git based isolated topic branch (tip/core/xen) - the
coordinates for it are below. The commit ID is:
4ef2d41: mm: define USE_SPLIT_PTLOCKS rather than repeating expression
Andrew, any objection to this approach? If it's fine to you then after
testing this commit will eventually go to linux-next via
tip/auto-core-next. (the x86 tree merges this tree and i've applied the
Xen fix after that merge.)
Ingo
----------------------------------------------->
the latest tip/core/xen topic tree is at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core/xen
------------------>
Jeremy Fitzhardinge (1):
mm: define USE_SPLIT_PTLOCKS rather than repeating expression
arch/x86/xen/mmu.c | 2 +-
include/linux/mm.h | 6 +++---
include/linux/mm_types.h | 10 ++++++----
include/linux/sched.h | 6 +++---
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index aa37469..2e1b640 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -646,7 +646,7 @@ static spinlock_t *lock_pte(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
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 72a15dc..4194bf8 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -919,7 +919,7 @@ static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long a
}
#endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
-#if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS
+#if USE_SPLIT_PTLOCKS
/*
* We tuck a spinlock to guard each pagetable page into its struct page,
* at page->private, with BUILD_BUG_ON to make sure that this will not
@@ -932,14 +932,14 @@ static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long a
} while (0)
#define ...
