Unverified Commit 9ad6bb32 authored by Samuel Holland's avatar Samuel Holland Committed by Palmer Dabbelt
Browse files

riscv: Remove PGDIR_SIZE_L3 and TASK_SIZE_MIN 



TASK_SIZE_MIN is unused since commit 085e2ff9 ("efi: libstub: Drop
randomization of runtime memory map"). PGDIR_SIZE_L3 is only used in the
definition of TASK_SIZE_MIN.

Signed-off-by: default avatarSamuel Holland <samuel.holland@sifive.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20240327143858.711792-2-samuel.holland@sifive.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 4cece764

arch/riscv/include/asm/pgtable-64.h

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ extern bool pgtable_l5_enabled; 
#define PGDIR_SHIFT_L3  30

#define PGDIR_SHIFT_L4  39

#define PGDIR_SHIFT_L5  48

#define PGDIR_SIZE_L3   (_AC(1, UL) << PGDIR_SHIFT_L3)



#define PGDIR_SHIFT     (pgtable_l5_enabled ? PGDIR_SHIFT_L5 : \

		(pgtable_l4_enabled ? PGDIR_SHIFT_L4 : PGDIR_SHIFT_L3))

/* Size of region mapped by a page global directory */

arch/riscv/include/asm/pgtable.h

+0 −2
Original line number Diff line number Diff line
@@ -870,7 +870,6 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) 
 */

#ifdef CONFIG_64BIT

#define TASK_SIZE_64	(PGDIR_SIZE * PTRS_PER_PGD / 2)

#define TASK_SIZE_MIN	(PGDIR_SIZE_L3 * PTRS_PER_PGD / 2)



#ifdef CONFIG_COMPAT

#define TASK_SIZE_32	(_AC(0x80000000, UL) - PAGE_SIZE)
@@ -882,7 +881,6 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) 


#else

#define TASK_SIZE	FIXADDR_START

#define TASK_SIZE_MIN	TASK_SIZE

#endif



#else /* CONFIG_MMU */