Changeset 95c675b in mainline for kernel/arch/ia64/include/arch/mm/page.h

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/include/arch/mm/page.h (modified) (3 diffs)

kernel/arch/ia64/include/arch/mm/page.h

@@ -38 +38 @@
 
 #include <arch/mm/frame.h>
+
+#ifndef __ASM__
+#include <assert.h>
+#endif
 
 #define PAGE_SIZE   FRAME_SIZE
@@ -232 +236 @@
         uint64_t ret;
         
-        ASSERT(i < REGION_REGISTERS);
+        assert(i < REGION_REGISTERS);
         
         asm volatile (
@@ -250 +254 @@
 NO_TRACE static inline void rr_write(size_t i, uint64_t v)
 {
-        ASSERT(i < REGION_REGISTERS);
+        assert(i < REGION_REGISTERS);
         
         asm volatile (