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 /include/linux/mm.h | |
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 'include/linux/mm.h')
-rw-r--r-- | include/linux/mm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 42a35d94b82c..dc3333d6c986 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -1316,7 +1316,7 @@ static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long a | |||
1316 | } | 1316 | } |
1317 | #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */ | 1317 | #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */ |
1318 | 1318 | ||
1319 | #if USE_SPLIT_PTLOCKS | 1319 | #if USE_SPLIT_PTE_PTLOCKS |
1320 | /* | 1320 | /* |
1321 | * We tuck a spinlock to guard each pagetable page into its struct page, | 1321 | * We tuck a spinlock to guard each pagetable page into its struct page, |
1322 | * at page->private, with BUILD_BUG_ON to make sure that this will not | 1322 | * at page->private, with BUILD_BUG_ON to make sure that this will not |
@@ -1329,14 +1329,14 @@ static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long a | |||
1329 | } while (0) | 1329 | } while (0) |
1330 | #define pte_lock_deinit(page) ((page)->mapping = NULL) | 1330 | #define pte_lock_deinit(page) ((page)->mapping = NULL) |
1331 | #define pte_lockptr(mm, pmd) ({(void)(mm); __pte_lockptr(pmd_page(*(pmd)));}) | 1331 | #define pte_lockptr(mm, pmd) ({(void)(mm); __pte_lockptr(pmd_page(*(pmd)));}) |
1332 | #else /* !USE_SPLIT_PTLOCKS */ | 1332 | #else /* !USE_SPLIT_PTE_PTLOCKS */ |
1333 | /* | 1333 | /* |
1334 | * We use mm->page_table_lock to guard all pagetable pages of the mm. | 1334 | * We use mm->page_table_lock to guard all pagetable pages of the mm. |
1335 | */ | 1335 | */ |
1336 | #define pte_lock_init(page) do {} while (0) | 1336 | #define pte_lock_init(page) do {} while (0) |
1337 | #define pte_lock_deinit(page) do {} while (0) | 1337 | #define pte_lock_deinit(page) do {} while (0) |
1338 | #define pte_lockptr(mm, pmd) ({(void)(pmd); &(mm)->page_table_lock;}) | 1338 | #define pte_lockptr(mm, pmd) ({(void)(pmd); &(mm)->page_table_lock;}) |
1339 | #endif /* USE_SPLIT_PTLOCKS */ | 1339 | #endif /* USE_SPLIT_PTE_PTLOCKS */ |
1340 | 1340 | ||
1341 | static inline void pgtable_page_ctor(struct page *page) | 1341 | static inline void pgtable_page_ctor(struct page *page) |
1342 | { | 1342 | { |