summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/intro.9.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/intro.9.txt b/doc/intro.9.txt
index dcf138a3..903be63d 100644
--- a/doc/intro.9.txt
+++ b/doc/intro.9.txt
@@ -263,12 +263,11 @@ module:arch/tcb::
module:arch/trap::
Interrupt and exception handling.
-X15 currently requires a memory management unit, but that may change in
-the future. In addition, the machine-independent code assumes an almost
-completely relaxed memory model, but still expects no reordering between
-dependent loads. This model closely matches the ARM family of processors.
+The machine-independent code assumes a completely relaxed memory model as
+allowed by the C11 specification.
-TODO Fix memory model description
+X15 currently requires a memory management unit, but that may change in
+the future.
SEE
---