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

kernel/arch/sparc64/src/mm/sun4u/as.c

@@ -35 +35 @@
 #include <arch/mm/as.h>
 #include <arch/mm/tlb.h>
+#include <assert.h>
+#include <config.h>
 #include <genarch/mm/page_ht.h>
 #include <genarch/mm/asid_fifo.h>
-#include <debug.h>
-#include <config.h>
 
 #ifdef CONFIG_TSB
@@ -47 +47 @@
 #include <bitops.h>
 #include <macros.h>
-#include <memstr.h>
+#include <mem.h>
 
 #endif /* CONFIG_TSB */
@@ -130 +130 @@
         uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH);
         
-        ASSERT(as->arch.itsb);
-        ASSERT(as->arch.dtsb);
+        assert(as->arch.itsb);
+        assert(as->arch.dtsb);
         
         uintptr_t tsb = (uintptr_t) as->arch.itsb;
@@ -202 +202 @@
         uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH);
         
-        ASSERT(as->arch.itsb);
-        ASSERT(as->arch.dtsb);
+        assert(as->arch.itsb);
+        assert(as->arch.dtsb);
         
         uintptr_t tsb = (uintptr_t) as->arch.itsb;