2022-03-28 12:52:17

by Rolf Eike Beer

Subject: [PATCH] arc: drop definitions of pgd_index() and pgd_offset{,_k}() entirely

They were in <asm/pgtables.h> and have been removed from there in
974b9b2c68f ("mm: consolidate pte_index() and pte_offset_*() definitions")
in favor of the generic version. But that missed that the same definitons
also existed in <asm/pgtable-levels.h>, where they were (inadvertently?)
introduced in fe6cb7b043b6 ("ARC: mm: disintegrate pgtable.h into levels
and flags").

Fixes: 974b9b2c68f ("mm: consolidate pte_index() and pte_offset_*() definitions")
Fixes: fe6cb7b043b6 ("ARC: mm: disintegrate pgtable.h into levels and flags")
Signed-off-by: Rolf Eike Beer <[email protected]>
---
arch/arc/include/asm/pgtable-levels.h | 3 ---
1 file changed, 3 deletions(-)

diff --git a/arch/arc/include/asm/pgtable-levels.h b/arch/arc/include/asm/pgtable-levels.h
index 7848348719b2..64ca25d199be 100644
--- a/arch/arc/include/asm/pgtable-levels.h
+++ b/arch/arc/include/asm/pgtable-levels.h
@@ -98,9 +98,6 @@
/*
* 1st level paging: pgd
*/
-#define pgd_index(addr) ((addr) >> PGDIR_SHIFT)
-#define pgd_offset(mm, addr) (((mm)->pgd) + pgd_index(addr))
-#define pgd_offset_k(addr) pgd_offset(&init_mm, addr)
#define pgd_ERROR(e) \
pr_crit("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))

--
2.35.1


--
Rolf Eike Beer, emlix GmbH, https://www.emlix.com
Fon +49 551 30664-0, Fax +49 551 30664-11
Gothaer Platz 3, 37083 Göttingen, Germany
Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160
Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055

emlix - smart embedded open source

2022-04-22 21:49:32

by Vineet Gupta

Subject: Re: [PATCH] arc: drop definitions of pgd_index() and pgd_offset{, _k}() entirely

On 3/28/22 01:15, Rolf Eike Beer wrote:
> They were in <asm/pgtables.h> and have been removed from there in
> 974b9b2c68f ("mm: consolidate pte_index() and pte_offset_*() definitions")
> in favor of the generic version. But that missed that the same definitons
> also existed in <asm/pgtable-levels.h>, where they were (inadvertently?)
> introduced in fe6cb7b043b6 ("ARC: mm: disintegrate pgtable.h into levels
> and flags").
>
> Fixes: 974b9b2c68f ("mm: consolidate pte_index() and pte_offset_*() definitions")
> Fixes: fe6cb7b043b6 ("ARC: mm: disintegrate pgtable.h into levels and flags")
> Signed-off-by: Rolf Eike Beer<[email protected]>

Indeed I missed the upstream change when doing the rework for paging levels.

Applied !

Thx,
-Vineet