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

Commit 32f84528 authored by Chris Forbes's avatar Chris Forbes Committed by Linus Torvalds
Browse files

mm: hugetlb: fix coding style issues 



Fix coding style issues flagged by checkpatch.pl

Signed-off-by: default avatarChris Forbes <chrisf@ijw.co.nz>
Acked-by: default avatarEric B Munson <emunson@mgebm.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d788e80a

mm/hugetlb.c

+15 −16
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include <asm/page.h>

#include <asm/pgtable.h>

#include <asm/io.h>

#include <linux/io.h>



#include <linux/hugetlb.h>

#include <linux/node.h>
@@ -503,8 +503,9 @@ static void update_and_free_page(struct hstate *h, struct page *page) 
	h->nr_huge_pages--;

	h->nr_huge_pages_node[page_to_nid(page)]--;

	for (i = 0; i < pages_per_huge_page(h); i++) {

		page[i].flags &= ~(1 << PG_locked | 1 << PG_error | 1 << PG_referenced |

				1 << PG_dirty | 1 << PG_active | 1 << PG_reserved |

		page[i].flags &= ~(1 << PG_locked | 1 << PG_error |

				1 << PG_referenced | 1 << PG_dirty |

				1 << PG_active | 1 << PG_reserved |

				1 << PG_private | 1 << PG_writeback);

	}

	set_compound_page_dtor(page, NULL);
@@ -591,7 +592,6 @@ int PageHuge(struct page *page) 


	return dtor == free_huge_page;

}



EXPORT_SYMBOL_GPL(PageHuge);



static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid)
@@ -2132,10 +2132,9 @@ static void set_huge_ptep_writable(struct vm_area_struct *vma, 
	pte_t entry;



	entry = pte_mkwrite(pte_mkdirty(huge_ptep_get(ptep)));

	if (huge_ptep_set_access_flags(vma, address, ptep, entry, 1)) {

	if (huge_ptep_set_access_flags(vma, address, ptep, entry, 1))

		update_mmu_cache(vma, address, ptep);

}

}





int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
@@ -2189,9 +2188,9 @@ static int is_hugetlb_entry_migration(pte_t pte) 
	if (huge_pte_none(pte) || pte_present(pte))

		return 0;

	swp = pte_to_swp_entry(pte);

	if (non_swap_entry(swp) && is_migration_entry(swp)) {

	if (non_swap_entry(swp) && is_migration_entry(swp))

		return 1;

	} else

	else

		return 0;

}
@@ -2202,9 +2201,9 @@ static int is_hugetlb_entry_hwpoisoned(pte_t pte) 
	if (huge_pte_none(pte) || pte_present(pte))

		return 0;

	swp = pte_to_swp_entry(pte);

	if (non_swap_entry(swp) && is_hwpoison_entry(swp)) {

	if (non_swap_entry(swp) && is_hwpoison_entry(swp))

		return 1;

	} else

	else

		return 0;

}