[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/5] exec: Fix overlap of PAGE_ANON and PAGE_TARGET_1
From: |
Peter Maydell |
Subject: |
[PULL 5/5] exec: Fix overlap of PAGE_ANON and PAGE_TARGET_1 |
Date: |
Mon, 12 Apr 2021 11:31:52 +0100 |
From: Richard Henderson <richard.henderson@linaro.org>
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>
---
include/exec/cpu-all.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index d76b0b9e02d..32cfb634c6a 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);
--
2.20.1
- [PULL 0/5] target-arm queue, Peter Maydell, 2021/04/12
- [PULL 1/5] hw/arm/virt-acpi-build: Fix GSIV values of the {GERR, Sync} interrupts, Peter Maydell, 2021/04/12
- [PULL 2/5] hw/arm/smmuv3: Emulate CFGI_STE_RANGE for an aligned range of StreamIDs, Peter Maydell, 2021/04/12
- [PULL 5/5] exec: Fix overlap of PAGE_ANON and PAGE_TARGET_1,
Peter Maydell <=
- [PULL 4/5] target/arm: Check PAGE_WRITE_ORG for MTE writeability, Peter Maydell, 2021/04/12
- [PULL 3/5] accel/tcg: Preserve PAGE_ANON when changing page permissions, Peter Maydell, 2021/04/12
- Re: [PULL 0/5] target-arm queue, no-reply, 2021/04/12
- Re: [PULL 0/5] target-arm queue, Peter Maydell, 2021/04/12