diff --git a/arch b/arch
index e942051057f..b025eeaa21e 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit e942051057f9e7e71e0adb29b2d9a67f98fc205b
+Subproject commit b025eeaa21ef4cf9e1fc0279183b02d45790bb7f
diff --git a/configs b/configs
index c5d86a886c2..a619d398029 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit c5d86a886c2f384f427b2dab78de610e8076c680
+Subproject commit a619d398029baac7d2246f9beaa0b3c6fe9b1d2c
diff --git a/sched/sched/sched_setscheduler.c b/sched/sched/sched_setscheduler.c
index d3650374bb8..89fa9095aae 100644
--- a/sched/sched/sched_setscheduler.c
+++ b/sched/sched/sched_setscheduler.c
@@ -132,7 +132,7 @@ int sched_setscheduler(pid_t pid, int policy,
   /* Further, disable timer interrupts while we set up scheduling policy. */
 
   saved_state = irqsave();
-  tcb->flags &= TCB_FLAG_POLICY_MASK;
+  tcb->flags &= ~TCB_FLAG_POLICY_MASK;
   switch (policy)
     {
       default: