Changeset 95c675b in mainline for kernel/arch/sparc64/src/mm/sun4v/tsb.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/sparc64/src/mm/sun4v/tsb.c (modified) (2 diffs)

kernel/arch/sparc64/src/mm/sun4v/tsb.c

@@ -39 +39 @@
 #include <arch/mm/page.h>
 #include <arch/barrier.h>
+#include <assert.h>
 #include <mm/as.h>
 #include <typedefs.h>
 #include <macros.h>
-#include <debug.h>
 
 /** Invalidate portion of TSB.
@@ -60 +60 @@
         size_t cnt;
         
-        ASSERT(as->arch.tsb_description.tsb_base);
+        assert(as->arch.tsb_description.tsb_base);
         
         i0 = (page >> MMU_PAGE_WIDTH) & TSB_ENTRY_MASK;