Changeset e6a78b9 in mainline for kernel/genarch/src

Timestamp:

2012-06-29T15:31:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c0 (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.

Location:

kernel/genarch/src

Files:

• kbrd/kbrd.c (modified) (1 diff)
• mm/as_ht.c (modified) (1 diff)
• srln/srln.c (modified) (1 diff)

kernel/genarch/src/kbrd/kbrd.c

@@ -158 +158 @@
             = malloc(sizeof(kbrd_instance_t), FRAME_ATOMIC);
         if (instance) {
-                instance->thread
-                        = thread_create(kkbrd, (void *) instance, TASK, 0, "kkbrd", false);
+                instance->thread = thread_create(kkbrd, (void *) instance,
+                    TASK, THREAD_FLAG_NONE, "kkbrd");
                 
                 if (!instance->thread) {

kernel/genarch/src/mm/as_ht.c

@@ -78 +78 @@
                 hash_table_create(&page_ht, PAGE_HT_ENTRIES, 2, &ht_operations);
                 mutex_initialize(&page_ht_lock, MUTEX_PASSIVE);
-                pte_cache = slab_cache_create("pte_cache", sizeof(pte_t), 0, NULL, NULL,
-                    SLAB_CACHE_MAGDEFERRED);
+                pte_cache = slab_cache_create("pte_t", sizeof(pte_t), 0,
+                    NULL, NULL, SLAB_CACHE_MAGDEFERRED);
         }
         

kernel/genarch/src/srln/srln.c

@@ -130 +130 @@
             = malloc(sizeof(srln_instance_t), FRAME_ATOMIC);
         if (instance) {
-                instance->thread
-                        = thread_create(ksrln, (void *) instance, TASK, 0, "ksrln", false);
+                instance->thread = thread_create(ksrln, (void *) instance,
+                    TASK, THREAD_FLAG_NONE, "ksrln");
                 
                 if (!instance->thread) {