Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d12efae authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

mm/mprotect.c: coding-style cleanups 



A few gremlins have recently crept in.

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5bbe1ec1

mm/mprotect.c

+16 −14
Original line number Original line Diff line number Diff line
@@ -128,9 +128,9 @@ static inline void change_pmd_protnuma(struct mm_struct *mm, unsigned long addr, 
}

}

#endif /* CONFIG_NUMA_BALANCING */

#endif /* CONFIG_NUMA_BALANCING */





static inline unsigned long change_pmd_range(struct vm_area_struct *vma, pud_t *pud,

static inline unsigned long change_pmd_range(struct vm_area_struct *vma,

		unsigned long addr, unsigned long end, pgprot_t newprot,

		pud_t *pud, unsigned long addr, unsigned long end,

		int dirty_accountable, int prot_numa)

		pgprot_t newprot, int dirty_accountable, int prot_numa)

{

{

	pmd_t *pmd;

	pmd_t *pmd;

	unsigned long next;

	unsigned long next;
@@ -143,7 +143,8 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma, pud_t * 
		if (pmd_trans_huge(*pmd)) {

		if (pmd_trans_huge(*pmd)) {

			if (next - addr != HPAGE_PMD_SIZE)

			if (next - addr != HPAGE_PMD_SIZE)

				split_huge_page_pmd(vma, addr, pmd);

				split_huge_page_pmd(vma, addr, pmd);

			else if (change_huge_pmd(vma, pmd, addr, newprot, prot_numa)) {

			else if (change_huge_pmd(vma, pmd, addr, newprot,

						 prot_numa)) {

				pages += HPAGE_PMD_NR;

				pages += HPAGE_PMD_NR;

				continue;

				continue;

			}

			}
@@ -167,9 +168,9 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma, pud_t * 
	return pages;

	return pages;

}

}





static inline unsigned long change_pud_range(struct vm_area_struct *vma, pgd_t *pgd,

static inline unsigned long change_pud_range(struct vm_area_struct *vma,

		unsigned long addr, unsigned long end, pgprot_t newprot,

		pgd_t *pgd, unsigned long addr, unsigned long end,

		int dirty_accountable, int prot_numa)

		pgprot_t newprot, int dirty_accountable, int prot_numa)

{

{

	pud_t *pud;

	pud_t *pud;

	unsigned long next;

	unsigned long next;
@@ -304,7 +305,8 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, 
		dirty_accountable = 1;

		dirty_accountable = 1;

	}

	}





	change_protection(vma, start, end, vma->vm_page_prot, dirty_accountable, 0);

	change_protection(vma, start, end, vma->vm_page_prot,

			  dirty_accountable, 0);





	vm_stat_account(mm, oldflags, vma->vm_file, -nrpages);

	vm_stat_account(mm, oldflags, vma->vm_file, -nrpages);

	vm_stat_account(mm, newflags, vma->vm_file, nrpages);

	vm_stat_account(mm, newflags, vma->vm_file, nrpages);
@@ -361,8 +363,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, 
		error = -EINVAL;

		error = -EINVAL;

		if (!(vma->vm_flags & VM_GROWSDOWN))

		if (!(vma->vm_flags & VM_GROWSDOWN))

			goto out;

			goto out;

	}

	} else {

	else {

		if (vma->vm_start > start)

		if (vma->vm_start > start)

			goto out;

			goto out;

		if (unlikely(grows & PROT_GROWSUP)) {

		if (unlikely(grows & PROT_GROWSUP)) {
@@ -380,7 +381,8 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, 




		/* Here we know that vma->vm_start <= nstart < vma->vm_end. */

		/* Here we know that vma->vm_start <= nstart < vma->vm_end. */





		newflags = vm_flags | (vma->vm_flags & ~(VM_READ | VM_WRITE | VM_EXEC));

		newflags = vm_flags;

		newflags |= (vma->vm_flags & ~(VM_READ | VM_WRITE | VM_EXEC));





		/* newflags >> 4 shift VM_MAY% in place of VM_% */

		/* newflags >> 4 shift VM_MAY% in place of VM_% */

		if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {

		if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {