Skip to content

Commit

Permalink
exec: Fix overlap of PAGE_ANON and PAGE_TARGET_1
Browse files Browse the repository at this point in the history
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: 26bab75 ("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>
  • Loading branch information
rth7680 authored and pm215 committed Apr 12, 2021
1 parent ff38bca commit 52c01ad
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/exec/cpu-all.h
Expand Up @@ -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);
Expand Down

0 comments on commit 52c01ad

Please sign in to comment.