diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-01-26 00:11:17 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-01-26 00:11:17 +0300 |
| commit | e1a063f43a5e0435ecf8a2b6d42e10e20e8caf61 (patch) | |
| tree | 7329fb15e57917a503c859f7266fcd034728bd54 /arch/arm64/mm/hugetlbpage.c | |
| parent | 9eb5d0e635ebe2f227d591e531d48c6f01c0dd78 (diff) | |
| parent | 0369d6315bc2bc56da2a2b15c8074b889096a47e (diff) | |
| download | linux-e1a063f43a5e0435ecf8a2b6d42e10e20e8caf61.tar.xz | |
Merge branch 'topic/intel-lpe-audio' into for-next
Diffstat (limited to 'arch/arm64/mm/hugetlbpage.c')
| -rw-r--r-- | arch/arm64/mm/hugetlbpage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 964b7549af5c..e25584d72396 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -239,7 +239,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, ncontig = find_num_contig(vma->vm_mm, addr, cpte, *cpte, &pgsize); for (i = 0; i < ncontig; ++i, ++cpte, addr += pgsize) { - changed = ptep_set_access_flags(vma, addr, cpte, + changed |= ptep_set_access_flags(vma, addr, cpte, pfn_pte(pfn, hugeprot), dirty); |