Changeset 6843a9c in mainline for kernel/genarch/include/mm/page_ht.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• kernel/genarch/include/mm/page_ht.h (modified) (2 diffs)

kernel/genarch/include/mm/page_ht.h

@@ -43 +43 @@
 #include <mm/as.h>
 #include <mm/page.h>
+#include <mm/slab.h>
 #include <synch/mutex.h>
 #include <adt/hash_table.h>
@@ -64 +65 @@
 extern page_mapping_operations_t ht_mapping_operations;
 
+extern slab_cache_t *pte_cache;
 extern mutex_t page_ht_lock;
 extern hash_table_t page_ht;