diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:05:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:05:45 +0200 |
| commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
| tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /arch/x86/xen | |
| parent | xen: make CPU hotplug functions static (diff) | |
| parent | mm: define USE_SPLIT_PTLOCKS rather than repeating expression (diff) | |
| download | linux-3ce9bcb583536c45a46c7302747029450e22279c.tar.xz linux-3ce9bcb583536c45a46c7302747029450e22279c.zip | |
Merge branch 'core/xen' into x86/xen
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index f5af913fd7b0..64e58681767e 100644 --- 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 |