From e6602d527c0028e4c827015ce151163274484511 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Mon, 30 May 2022 11:23:09 +0200 Subject: [PATCH] lx_emul: remove duplication of ZERO_PAGE for ARM The extra definition introduced by commit: "lx_emul & arm: define ZERO_PAGE" re-defined the macro included by a header of the contrib sources. This commit removes the contrib header and defines thereby missing macros. --- .../src/include/lx_emul/shadow/arch/arm/include/asm/pgtable.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/pgtable.h b/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/pgtable.h index ad6689b95f..aa21f7eb39 100644 --- a/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/pgtable.h +++ b/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/pgtable.h @@ -18,7 +18,8 @@ #include #include #include -#include + +#define PGDIR_SHIFT 21 #ifndef __ASSEMBLY__