Changeset 0dc2fec in mainline for kernel/arch/ia32/src/mm/page.c

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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 changes

File:

• kernel/arch/ia32/src/mm/page.c (modified) (1 diff)

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

@@ -76 +76 @@
         page_table_unlock(AS_KERNEL, true);
                 
-        exc_register(14, "page_fault", true, (iroutine_t) page_fault);
+        exc_register(VECTOR_PF, "page_fault", true, (iroutine_t) page_fault);
         write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);