[PATCH v7 11/70] arch/arm64: Remove the merge workaround for VMA_ITERATOR

Liam Howlett
2022-04-04T14:36:43Z

Now that the vma iterator is in the kernel, remove the workaround.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
arch/arm64/kernel/elfcore.c | 7 -------
1 file changed, 7 deletions(-)

diff --git a/arch/arm64/kernel/elfcore.c b/arch/arm64/kernel/elfcore.c
index 3ed39c61a510..930a0bc4cac4 100644
--- a/arch/arm64/kernel/elfcore.c
+++ b/arch/arm64/kernel/elfcore.c
@@ -8,13 +8,6 @@
#include <asm/cpufeature.h>
#include <asm/mte.h>

-#ifndef VMA_ITERATOR
-#define VMA_ITERATOR(name, mm, addr) \
- struct mm_struct *name = mm
-#define for_each_vma(vmi, vma) \
- for (vma = vmi->mmap; vma; vma = vma->vm_next)
-#endif
-
#define for_each_mte_vma(vmi, vma) \
if (system_supports_mte()) \
for_each_vma(vmi, vma) \
--
2.34.1