diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2014-08-16 06:37:29 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2014-08-16 06:37:29 -0400 |
commit | 030f51ce818e06cd35f2e5ada0e7cebb98bfe2d5 (patch) | |
tree | 1dbaf59e27c7860edfcf4c5d9eada3d78596ecd0 /firmware/kernel | |
parent | 528715a672a53156d7cb1382c344954d4d59cfc6 (diff) | |
download | rockbox-030f51ce818e06cd35f2e5ada0e7cebb98bfe2d5.tar.gz rockbox-030f51ce818e06cd35f2e5ada0e7cebb98bfe2d5.zip |
Oops. Broke an egg. Restore wrongly removed code in mutex.c.
Nice colorful diffs reveals some lines that should NOT have been
removed when !defined(HAVE_PRIORITY_SCHEDULING) in mutex_unlock.
Change-Id: I4152ea864b7706217c670e1b99250b09e69c5858
Diffstat (limited to 'firmware/kernel')
-rw-r--r-- | firmware/kernel/mutex.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/firmware/kernel/mutex.c b/firmware/kernel/mutex.c index fc49cc6d09..876b704b51 100644 --- a/firmware/kernel/mutex.c +++ b/firmware/kernel/mutex.c | |||
@@ -103,6 +103,12 @@ void mutex_unlock(struct mutex *m) | |||
103 | } | 103 | } |
104 | 104 | ||
105 | const int oldlevel = disable_irq_save(); | 105 | const int oldlevel = disable_irq_save(); |
106 | /* Tranfer of owning thread is handled in the wakeup protocol | ||
107 | * if priorities are enabled otherwise just set it from the | ||
108 | * queue head. */ | ||
109 | #ifndef HAVE_PRIORITY_SCHEDULING | ||
110 | m->blocker.thread = thread; | ||
111 | #endif | ||
106 | unsigned int result = wakeup_thread(thread, WAKEUP_TRANSFER); | 112 | unsigned int result = wakeup_thread(thread, WAKEUP_TRANSFER); |
107 | restore_irq(oldlevel); | 113 | restore_irq(oldlevel); |
108 | 114 | ||