diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
| commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
| tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /arch/x86/xen | |
| parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
| parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) | |
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) | |||
| 746 | { | 746 | { |
| 747 | spinlock_t *ptl = NULL; | 747 | spinlock_t *ptl = NULL; |
| 748 | 748 | ||
| 749 | #if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS | 749 | #if USE_SPLIT_PTLOCKS |
| 750 | ptl = __pte_lockptr(page); | 750 | ptl = __pte_lockptr(page); |
| 751 | spin_lock(ptl); | 751 | spin_lock(ptl); |
| 752 | #endif | 752 | #endif |