summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2017-09-07 20:59:07 +0200
committerRichard Braun <rbraun@sceen.net>2017-09-07 20:59:07 +0200
commit86aa733ad44b4f20947ab8549920a48bd997282f (patch)
tree0355c1e39a22521359c1f465ade8271f5361400f /doc
parenteb726b5bcbf44e053727b69aa85d86e81c7d1e65 (diff)
doc/intro(9): fix machine-independent code memory model description
Diffstat (limited to 'doc')
-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 dcf138a..903be63 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
---