2 files changed, 2 insertions, 14 deletions

diff --git a/firmware/kernel/include/mutex.h b/firmware/kernel/include/mutex.h
index b74bfe23f5..4778eb7f11 100644
--- a/firmware/kernel/include/mutex.h
+++ b/firmware/kernel/include/mutex.h
@@ -31,21 +31,12 @@ struct mutex
     struct blocker      blocker;   /* priority inheritance info
                                       for waiters and owner*/
     IF_COP( struct corelock cl; )  /* multiprocessor sync */
-#ifdef HAVE_PRIORITY_SCHEDULING
-    bool                no_preempt;
-#endif
 };
 
 extern void mutex_init(struct mutex *m);
 extern void mutex_lock(struct mutex *m);
 extern void mutex_unlock(struct mutex *m);
-#ifdef HAVE_PRIORITY_SCHEDULING
-/* Deprecated temporary function to disable mutex preempting a thread on
- * unlock - firmware/drivers/fat.c and a couple places in apps/buffering.c -
- * reliance on it is a bug! */
-static inline void mutex_set_preempt(struct mutex *m, bool preempt)
-    { m->no_preempt = !preempt; }
-#else
+#ifndef HAVE_PRIORITY_SCHEDULING
 /* Deprecated but needed for now - firmware/drivers/ata_mmc.c */
 static inline bool mutex_test(const struct mutex *m)
     { return m->blocker.thread != NULL; }
diff --git a/firmware/kernel/mutex.c b/firmware/kernel/mutex.c
index 876b704b51..cb9e6816b8 100644
--- a/firmware/kernel/mutex.c
+++ b/firmware/kernel/mutex.c
@@ -33,9 +33,6 @@ void mutex_init(struct mutex *m)
     wait_queue_init(&m->queue);
     m->recursion = 0;
     blocker_init(&m->blocker);
-#ifdef HAVE_PRIORITY_SCHEDULING
-    m->no_preempt = false;
-#endif
     corelock_init(&m->cl);
 }
 
@@ -115,7 +112,7 @@ void mutex_unlock(struct mutex *m)
     corelock_unlock(&m->cl);
 
 #ifdef HAVE_PRIORITY_SCHEDULING
-    if((result & THREAD_SWITCH) && !m->no_preempt)
+    if(result & THREAD_SWITCH)
         switch_thread();
 #endif
     (void)result;