diff options
| author |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-03-08 11:09:25 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-03-08 15:00:14 +0100 |
| commit | 227be799c39a28bf5d68187a4ea1b43190d96515 (patch) | |
| tree | 54ba2e0d45cf4c38c721e9da79654ac79f6ac800 /arch/s390/mm/hugetlbpage.c | |
| parent | s390/mm: uninline ptep_xxx functions from pgtable.h (diff) | |
| download | linux-dev-227be799c39a28bf5d68187a4ea1b43190d96515.tar.xz linux-dev-227be799c39a28bf5d68187a4ea1b43190d96515.zip | |
s390/mm: uninline pmdp_xxx functions from pgtable.h
The pmdp_xxx function are smaller than their ptep_xxx counterparts
but to keep things symmetrical unline them as well.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/mm/hugetlbpage.c')
| -rw-r--r-- | arch/s390/mm/hugetlbpage.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c index f81096b6940d..1b5e8983f4f3 100644 --- a/arch/s390/mm/hugetlbpage.c +++ b/arch/s390/mm/hugetlbpage.c @@ -105,11 +105,10 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) { pmd_t *pmdp = (pmd_t *) ptep; - pte_t pte = huge_ptep_get(ptep); + pmd_t old; - pmdp_flush_direct(mm, addr, pmdp); - pmd_val(*pmdp) = _SEGMENT_ENTRY_EMPTY; - return pte; + old = pmdp_xchg_direct(mm, addr, pmdp, __pmd(_SEGMENT_ENTRY_EMPTY)); + return __pmd_to_pte(old); } pte_t *huge_pte_alloc(struct mm_struct *mm, |