diff options
author | Mel Gorman <mgorman@suse.de> | 2015-02-12 17:58:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 21:54:08 -0500 |
commit | 8a0516ed8b90c95ffa1363b420caa37418149f21 (patch) | |
tree | 64f95968661a136fa8a246419680420819dc1e0e /mm/memory.c | |
parent | e7bb4b6d1609cce391af1e7bc6f31d14f1a3a890 (diff) |
mm: convert p[te|md]_numa users to p[te|md]_protnone_numa
Convert existing users of pte_numa and friends to the new helper. Note
that the kernel is broken after this patch is applied until the other page
table modifiers are also altered. This patch layout is to make review
easier.
Signed-off-by: Mel Gorman <mgorman@suse.de>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Aneesh Kumar <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kirill Shutemov <kirill.shutemov@linux.intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index bbe6a73a899d..92e6a6299e86 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -3124,7 +3124,7 @@ static int handle_pte_fault(struct mm_struct *mm, | |||
3124 | pte, pmd, flags, entry); | 3124 | pte, pmd, flags, entry); |
3125 | } | 3125 | } |
3126 | 3126 | ||
3127 | if (pte_numa(entry)) | 3127 | if (pte_protnone(entry)) |
3128 | return do_numa_page(mm, vma, address, entry, pte, pmd); | 3128 | return do_numa_page(mm, vma, address, entry, pte, pmd); |
3129 | 3129 | ||
3130 | ptl = pte_lockptr(mm, pmd); | 3130 | ptl = pte_lockptr(mm, pmd); |
@@ -3202,7 +3202,7 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, | |||
3202 | if (pmd_trans_splitting(orig_pmd)) | 3202 | if (pmd_trans_splitting(orig_pmd)) |
3203 | return 0; | 3203 | return 0; |
3204 | 3204 | ||
3205 | if (pmd_numa(orig_pmd)) | 3205 | if (pmd_protnone(orig_pmd)) |
3206 | return do_huge_pmd_numa_page(mm, vma, address, | 3206 | return do_huge_pmd_numa_page(mm, vma, address, |
3207 | orig_pmd, pmd); | 3207 | orig_pmd, pmd); |
3208 | 3208 | ||