diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2013-11-14 17:30:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 19:32:14 -0500 |
commit | 57c1ffcefb5acb3c8b5f8436c325a6bdbd8e9c78 (patch) | |
tree | 2dc4008ef48c72673dd4a645e4a4f8e5c3ebb2c6 /arch/x86/xen | |
parent | e9bb18c7b95d4dcf8c7f0e14f920ca6f03109e75 (diff) |
mm: rename USE_SPLIT_PTLOCKS to USE_SPLIT_PTE_PTLOCKS
We're going to introduce split page table lock for PMD level. Let's
rename existing split ptlock for PTE level to avoid confusion.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Tested-by: Alex Thorlton <athorlton@sgi.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: "Eric W . Biederman" <ebiederm@xmission.com>
Cc: "Paul E . McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Dave Jones <davej@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Robin Holt <robinmholt@gmail.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/xen')
-rw-r--r-- | arch/x86/xen/mmu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index fdc3ba28ca38..455c873ce009 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -796,7 +796,7 @@ static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm) | |||
796 | { | 796 | { |
797 | spinlock_t *ptl = NULL; | 797 | spinlock_t *ptl = NULL; |
798 | 798 | ||
799 | #if USE_SPLIT_PTLOCKS | 799 | #if USE_SPLIT_PTE_PTLOCKS |
800 | ptl = __pte_lockptr(page); | 800 | ptl = __pte_lockptr(page); |
801 | spin_lock_nest_lock(ptl, &mm->page_table_lock); | 801 | spin_lock_nest_lock(ptl, &mm->page_table_lock); |
802 | #endif | 802 | #endif |
@@ -1637,7 +1637,7 @@ static inline void xen_alloc_ptpage(struct mm_struct *mm, unsigned long pfn, | |||
1637 | 1637 | ||
1638 | __set_pfn_prot(pfn, PAGE_KERNEL_RO); | 1638 | __set_pfn_prot(pfn, PAGE_KERNEL_RO); |
1639 | 1639 | ||
1640 | if (level == PT_PTE && USE_SPLIT_PTLOCKS) | 1640 | if (level == PT_PTE && USE_SPLIT_PTE_PTLOCKS) |
1641 | __pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pfn); | 1641 | __pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pfn); |
1642 | 1642 | ||
1643 | xen_mc_issue(PARAVIRT_LAZY_MMU); | 1643 | xen_mc_issue(PARAVIRT_LAZY_MMU); |
@@ -1671,7 +1671,7 @@ static inline void xen_release_ptpage(unsigned long pfn, unsigned level) | |||
1671 | if (!PageHighMem(page)) { | 1671 | if (!PageHighMem(page)) { |
1672 | xen_mc_batch(); | 1672 | xen_mc_batch(); |
1673 | 1673 | ||
1674 | if (level == PT_PTE && USE_SPLIT_PTLOCKS) | 1674 | if (level == PT_PTE && USE_SPLIT_PTE_PTLOCKS) |
1675 | __pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn); | 1675 | __pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn); |
1676 | 1676 | ||
1677 | __set_pfn_prot(pfn, PAGE_KERNEL); | 1677 | __set_pfn_prot(pfn, PAGE_KERNEL); |