Changeset 2a2fbc8 in mainline for kernel/genarch/src/mm/as_ht.c

Timestamp:

2016-09-01T17:05:13Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

42d08592

Parents:

f126c87 (diff), fb63c06 (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 from lp:~jakub/helenos/pt

File:

• kernel/genarch/src/mm/as_ht.c (modified) (5 diffs)

kernel/genarch/src/mm/as_ht.c

@@ -77 +77 @@
         if (flags & FLAG_AS_KERNEL) {
                 hash_table_create(&page_ht, PAGE_HT_ENTRIES, 2, &ht_operations);
-                mutex_initialize(&page_ht_lock, MUTEX_PASSIVE);
                 pte_cache = slab_cache_create("pte_t", sizeof(pte_t), 0,
                     NULL, NULL, SLAB_CACHE_MAGDEFERRED);
@@ -99 +98 @@
 /** Lock page table.
  *
- * Lock address space and page hash table.
+ * Lock address space.
  * Interrupts must be disabled.
  *
@@ -110 +109 @@
         if (lock)
                 mutex_lock(&as->lock);
-        
-        mutex_lock(&page_ht_lock);
 }
 
 /** Unlock page table.
  *
- * Unlock address space and page hash table.
+ * Unlock address space.
  * Interrupts must be disabled.
  *
@@ -125 +122 @@
 void ht_unlock(as_t *as, bool unlock)
 {
-        mutex_unlock(&page_ht_lock);
-        
         if (unlock)
                 mutex_unlock(&as->lock);
@@ -140 +135 @@
 bool ht_locked(as_t *as)
 {
-        return (mutex_locked(&page_ht_lock) && mutex_locked(&as->lock));
+        return mutex_locked(&as->lock);
 }