aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2021-04-06 10:40:31 -0700
committerPeter Maydell <peter.maydell@linaro.org>2021-04-12 11:06:24 +0100
commit52c01ada86611136e3122dd139788dbcbc292d86 (patch)
treee71dfe808a700301c357fd86c4218bcabebba1a4
parentff38bca7d633868ac094ef86f3b246e8f57181d4 (diff)
downloadqemu-arm-52c01ada86611136e3122dd139788dbcbc292d86.tar.gz
exec: Fix overlap of PAGE_ANON and PAGE_TARGET_1pull-target-arm-20210412
Unfortuately, the elements of PAGE_* were not in numerical order and so PAGE_ANON was added to an "unused" bit. As an arbitrary choice, move PAGE_TARGET_{1,2} together. Cc: Laurent Vivier <laurent@vivier.eu> Fixes: 26bab757d41b ("linux-user: Introduce PAGE_ANON") Buglink: https://bugs.launchpad.net/bugs/1922617 Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Tested-by: Laurent Vivier <laurent@vivier.eu> Tested-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--include/exec/cpu-all.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index d76b0b9e02..32cfb634c6 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -268,8 +268,8 @@ extern intptr_t qemu_host_page_mask;
#define PAGE_RESERVED 0x0100
#endif
/* Target-specific bits that will be used via page_get_flags(). */
-#define PAGE_TARGET_1 0x0080
-#define PAGE_TARGET_2 0x0200
+#define PAGE_TARGET_1 0x0200
+#define PAGE_TARGET_2 0x0400
#if defined(CONFIG_USER_ONLY)
void page_dump(FILE *f);