From 219b3e8a082ad2be533c3886bd7b3a17ef6320ff Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Sun, 4 Mar 2018 12:51:59 -0500 Subject: [PATCH] target/arm: Remove incorrect comment about MPU_CTRL Remove the comment that claims that some MPU_CTRL bits are stored in sctlr_el[1]. This has never been true since MPU_CTRL was added in commit 29c483a50607 -- the comment is a leftover from Michael Davidsaver's original implementation, which I modified not to use sctlr_el[1]; I forgot to delete the comment then. Backports commit 59e4972c3fc63d981e8b613ebb3bb01a05848075 from qemu --- qemu/target/arm/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/target/arm/cpu.h b/qemu/target/arm/cpu.h index ccc7685c..e5da47c0 100644 --- a/qemu/target/arm/cpu.h +++ b/qemu/target/arm/cpu.h @@ -422,7 +422,7 @@ typedef struct CPUARMState { uint32_t dfsr; /* Debug Fault Status Register */ uint32_t mmfar; /* MemManage Fault Address */ uint32_t bfar; /* BusFault Address */ - unsigned mpu_ctrl; /* MPU_CTRL (some bits kept in sctlr_el[1]) */ + unsigned mpu_ctrl; /* MPU_CTRL */ int exception; uint32_t secure; /* Is CPU in Secure state? (not guest visible) */ } v7m;