Changeset 95c675b in mainline for kernel/arch/ia64/src/mm/page.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• kernel/arch/ia64/src/mm/page.c (modified) (4 diffs)

kernel/arch/ia64/src/mm/page.c

@@ -35 +35 @@
 
 #include <arch/mm/page.h>
+#include <assert.h>
 #include <genarch/mm/page_ht.h>
 #include <mm/asid.h>
@@ -47 +48 @@
 #include <arch/asm.h>
 #include <arch/barrier.h>
-#include <memstr.h>
 #include <align.h>
 
@@ -167 +167 @@
         bool match;
 
-        ASSERT(v);
+        assert(v);
 
         vrn = page >> VRN_SHIFT;
@@ -214 +214 @@
         uint64_t tag;
 
-        ASSERT(v);
+        assert(v);
 
         vrn = page >> VRN_SHIFT;