Changeset c6218327 in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2010-04-28T19:58:21Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

373acb4

Parents:

6e121b8

Message:

When taking sysinfo_lock, interrupts don't have to be disabled.

File:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (18 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -104 +104 @@
 /** Recursively find an item in sysinfo tree
  *
- * Should be called with interrupts disabled
- * and sysinfo_lock held.
+ * Should be called with sysinfo_lock held.
  *
  * @param name    Current sysinfo path suffix.
@@ -170 +169 @@
 /** Recursively create items in sysinfo tree
  *
- * Should be called with interrupts disabled
- * and sysinfo_lock held.
+ * Should be called with sysinfo_lock held.
  *
  * @param name     Current sysinfo path suffix.
@@ -301 +299 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
         mutex_lock(&sysinfo_lock);
         
@@ -314 +311 @@
         
         mutex_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
 }
 
@@ -334 +330 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
         mutex_lock(&sysinfo_lock);
         
@@ -348 +343 @@
         
         mutex_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
 }
 
@@ -363 +357 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
         mutex_lock(&sysinfo_lock);
         
@@ -376 +369 @@
         
         mutex_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
 }
 
@@ -396 +388 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
         mutex_lock(&sysinfo_lock);
         
@@ -409 +400 @@
         
         mutex_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
 }
 
@@ -422 +412 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
         mutex_lock(&sysinfo_lock);
         
@@ -433 +422 @@
         
         mutex_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
 }
 
@@ -448 +436 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
         mutex_lock(&sysinfo_lock);
         
@@ -464 +451 @@
         
         mutex_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
 }
 
@@ -481 +467 @@
 /** Dump the structure of sysinfo tree
  *
- * Should be called with interrupts disabled
- * and sysinfo_lock held.
+ * Should be called with sysinfo_lock held.
  *
  * @param root  Root item of the current (sub)tree.
@@ -558 +543 @@
         /* Avoid other functions to mess with sysinfo
            while we are dumping it */
-        ipl_t ipl = interrupts_disable();
         mutex_lock(&sysinfo_lock);
         
@@ -567 +551 @@
         
         mutex_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
 }
 
 /** Return sysinfo item value determined by name
  *
- * Should be called with interrupts disabled
- * and sysinfo_lock held.
+ * Should be called with sysinfo_lock held.
  *
  * @param name    Sysinfo path.
@@ -658 +640 @@
                  * are reading it.
                  */
-                ipl_t ipl = interrupts_disable();
                 mutex_lock(&sysinfo_lock);
                 ret = sysinfo_get_item(path, NULL, dry_run);
                 mutex_unlock(&sysinfo_lock);
-                interrupts_restore(ipl);
         }
         free(path);