From d361a563191a0497c6518a4e3348c375965dd348 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 30 Jul 2015 00:01:07 +0000 Subject: [PATCH] mm-introduce-vm_lockonfault-checkpatch-fixes WARNING: line over 80 characters #103: FILE: include/linux/mm.h:132: +#define VM_LOCKONFAULT 0x00001000 /* Lock the pages covered when they are faulted in */ WARNING: line over 80 characters #195: FILE: mm/hugetlb.c:3768: + unsigned long svm_flags = svma->vm_flags & ~(VM_LOCKED | VM_LOCKONFAULT); WARNING: line over 80 characters #231: FILE: mm/rmap.c:747: + pra->vm_flags |= (vma->vm_flags & (VM_LOCKED | VM_LOCKONFAULT)); WARNING: line over 80 characters #240: FILE: mm/rmap.c:768: + pra->vm_flags |= (vma->vm_flags & (VM_LOCKED | VM_LOCKONFAULT)); total: 0 errors, 4 warnings, 138 lines checked ./patches/mm-introduce-vm_lockonfault.patch has style problems, please review. NOTE: If any of the errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. Please run checkpatch prior to sending patches Cc: Eric B Munson Signed-off-by: Andrew Morton --- mm/hugetlb.c | 4 ++-- mm/rmap.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 82caa48a18fe05..4ed9e937e8d0d7 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3764,8 +3764,8 @@ static unsigned long page_table_shareable(struct vm_area_struct *svma, unsigned long s_end = sbase + PUD_SIZE; /* Allow segments to share if only one is marked locked */ - unsigned long vm_flags = vma->vm_flags & ~(VM_LOCKED | VM_LOCKONFAULT); - unsigned long svm_flags = svma->vm_flags & ~(VM_LOCKED | VM_LOCKONFAULT); + unsigned long vm_flags = vma->vm_flags & ~(VM_LOCKED|VM_LOCKONFAULT); + unsigned long svm_flags = svma->vm_flags & ~(VM_LOCKED|VM_LOCKONFAULT); /* * match the virtual addresses, permission and the alignment of the diff --git a/mm/rmap.c b/mm/rmap.c index 47c855a86f7379..14ce002827d27f 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -744,7 +744,8 @@ static int page_referenced_one(struct page *page, struct vm_area_struct *vma, if (vma->vm_flags & VM_LOCKED) { spin_unlock(ptl); - pra->vm_flags |= (vma->vm_flags & (VM_LOCKED | VM_LOCKONFAULT)); + pra->vm_flags |= + (vma->vm_flags & (VM_LOCKED | VM_LOCKONFAULT)); return SWAP_FAIL; /* To break the loop */ } @@ -765,7 +766,8 @@ static int page_referenced_one(struct page *page, struct vm_area_struct *vma, if (vma->vm_flags & VM_LOCKED) { pte_unmap_unlock(pte, ptl); - pra->vm_flags |= (vma->vm_flags & (VM_LOCKED | VM_LOCKONFAULT)); + pra->vm_flags |= + (vma->vm_flags & (VM_LOCKED | VM_LOCKONFAULT)); return SWAP_FAIL; /* To break the loop */ }