diff options
| author | Arne Babenhauserheide <arne_bab@web.de> | 2011-11-05 18:29:51 +0100 |
|---|---|---|
| committer | Arne Babenhauserheide <arne_bab@web.de> | 2011-11-05 18:29:51 +0100 |
| commit | ae2fb6ad10b538d428ff0dd7138ae1cf02b1862a (patch) | |
| tree | 4a66b774bf493e95fc2961236de0ee84b4646362 /open_issues/dde/137784 | |
| parent | 42dc7198bbea79f4abe15d40804f539ffed1b05b (diff) | |
| parent | 2e315ef11db39e8ee0a0decc054801521ee049dd (diff) | |
fix merge conflict
Diffstat (limited to 'open_issues/dde/137784')
| -rw-r--r-- | open_issues/dde/137784 | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/open_issues/dde/137784 b/open_issues/dde/137784 new file mode 100644 index 00000000..1529465b --- /dev/null +++ b/open_issues/dde/137784 @@ -0,0 +1,43 @@ +diff --git a/libdde_linux26/lib/src/arch/l4/cli_sti.c b/libdde_linux26/lib/src/arch/l4/cli_sti.c +index 051f259..6a8c460 100644 +--- a/libdde_linux26/lib/src/arch/l4/cli_sti.c ++++ b/libdde_linux26/lib/src/arch/l4/cli_sti.c +@@ -4,6 +4,8 @@ + + /* IRQ lock reference counter */ + static atomic_t _refcnt = ATOMIC_INIT(0); ++/* Refcnt value at which unlocking the cli_lock (it's not always 0) */ ++static int unlock_refcnt; + static ddekit_lock_t cli_lock; + + /* Check whether IRQs are currently disabled. +@@ -57,9 +59,6 @@ void fake_local_irq_restore(unsigned long flags) + /* Store the current flags state. + * + * This is done by returning the current refcnt. +- * +- * XXX: Up to now, flags was always 0 at this point and +- * I assume that this is always the case. Prove? + */ + unsigned long __raw_local_save_flags(void) + { +@@ -82,7 +81,7 @@ void raw_local_irq_restore(unsigned long flags) + { + Assert(cli_lock != NULL); + atomic_set(&_refcnt, flags); +- if (flags == 0) ++ if (flags == unlock_refcnt) + ddekit_lock_unlock(&cli_lock); + } + +@@ -95,7 +94,9 @@ void raw_local_irq_disable(void) + if (cli_lock == NULL) + ddekit_lock_init_unlocked(&cli_lock); + +- nested_lock(cli_lock); ++ if (nested_lock(cli_lock)) ++ /* Tell the corresponding restorer to release cli_lock */ ++ unlock_refcnt = atomic_read(&_refcnt); + atomic_inc(&_refcnt); + } + |