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

Commit e926f449 authored by Russell King's avatar Russell King
Browse files

ARM: pgtable: remove FIRST_USER_PGD_NR 



FIRST_USER_PGD_NR is now unnecessary, as this has been replaced by
FIRST_USER_ADDRESS except in the architecture code.  Fix up the last
usage of FIRST_USER_PGD_NR, and remove the definition.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent af3813d6

arch/arm/include/asm/pgtable.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -138,8 +138,7 @@ extern void __pgd_error(const char *file, int line, pgd_t); 
 */

 */

#define FIRST_USER_ADDRESS	PAGE_SIZE

#define FIRST_USER_ADDRESS	PAGE_SIZE





#define FIRST_USER_PGD_NR	1

#define USER_PTRS_PER_PGD	(TASK_SIZE / PGDIR_SIZE)

#define USER_PTRS_PER_PGD	((TASK_SIZE/PGDIR_SIZE) - FIRST_USER_PGD_NR)





/*

/*

 * section address mask and size definitions.

 * section address mask and size definitions.

arch/arm/mm/pgd.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -17,8 +17,6 @@ 




#include "mm.h"

#include "mm.h"





#define FIRST_KERNEL_PGD_NR	(FIRST_USER_PGD_NR + USER_PTRS_PER_PGD)



/*

/*

 * need to get a 16k page for level 1

 * need to get a 16k page for level 1

 */

 */
@@ -32,14 +30,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm) 
	if (!new_pgd)

	if (!new_pgd)

		goto no_pgd;

		goto no_pgd;





	memset(new_pgd, 0, FIRST_KERNEL_PGD_NR * sizeof(pgd_t));

	memset(new_pgd, 0, USER_PTRS_PER_PGD * sizeof(pgd_t));





	/*

	/*

	 * Copy over the kernel and IO PGD entries

	 * Copy over the kernel and IO PGD entries

	 */

	 */

	init_pgd = pgd_offset_k(0);

	init_pgd = pgd_offset_k(0);

	memcpy(new_pgd + FIRST_KERNEL_PGD_NR, init_pgd + FIRST_KERNEL_PGD_NR,

	memcpy(new_pgd + USER_PTRS_PER_PGD, init_pgd + USER_PTRS_PER_PGD,

		       (PTRS_PER_PGD - FIRST_KERNEL_PGD_NR) * sizeof(pgd_t));

		       (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));





	clean_dcache_area(new_pgd, PTRS_PER_PGD * sizeof(pgd_t));

	clean_dcache_area(new_pgd, PTRS_PER_PGD * sizeof(pgd_t));