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

Commit e7f3bac9 authored by Haavard Skinnemoen's avatar Haavard Skinnemoen
Browse files

[AVR32] Simplify pte_alloc_one{,_kernel} 



There's really no need to retry an allocation with __GFP_REPEAT set.
Also, use get_zeroed_page() and __GFP_ZERO to eliminate the extra call
to clear_page() afterwards.

Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
parent 5221b34e

include/asm-avr32/pgalloc.h

+2 −20
Original line number Diff line number Diff line
@@ -38,18 +38,9 @@ static inline void pgd_free(pgd_t *pgd) 
static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,

					  unsigned long address)

{

	int count = 0;

	pte_t *pte;



	do {

		pte = (pte_t *) __get_free_page(GFP_KERNEL | __GFP_REPEAT);

		if (pte)

			clear_page(pte);

		else {

			current->state = TASK_UNINTERRUPTIBLE;

			schedule_timeout(HZ);

		}

	} while (!pte && (count++ < 10));

	pte = (pte_t *)get_zeroed_page(GFP_KERNEL | __GFP_REPEAT);



	return pte;

}
@@ -57,18 +48,9 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, 
static inline struct page *pte_alloc_one(struct mm_struct *mm,

					 unsigned long address)

{

	int count = 0;

	struct page *pte;



	do {

		pte = alloc_pages(GFP_KERNEL, 0);

		if (pte)

			clear_page(page_address(pte));

		else {

			current->state = TASK_UNINTERRUPTIBLE;

			schedule_timeout(HZ);

		}

	} while (!pte && (count++ < 10));

	pte = alloc_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);



	return pte;

}