Changeset 057e77f in mainline for kernel/generic/include/preemption.h

Timestamp:

2012-07-16T15:31:56Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

0cf813d

Parents:

0594c7ea

Message:

preemption_disable: Removed failed attempt at rescheduling once preemption is enabled (and needed). Once again, preemption_enable() never reschedules.

File:

• kernel/generic/include/preemption.h (modified) (3 diffs)

kernel/generic/include/preemption.h

@@ -40 +40 @@
 #include <debug.h>
 
-#define PREEMPTION_INC         (1 << 1)
-#define PREEMPTION_NEEDED_FLAG (1 << 0)
-#define PREEMPTION_NEEDED      (THE->preemption & PREEMPTION_NEEDED_FLAG)
+#define PREEMPTION_INC         (1 << 0)
 #define PREEMPTION_DISABLED    (PREEMPTION_INC <= THE->preemption)
 #define PREEMPTION_ENABLED     (!PREEMPTION_DISABLED)
@@ -53 +51 @@
         } while (0)
 
-/** Restores preemption and reschedules if out time slice already elapsed.*/
+/** Restores preemption but never reschedules. */
 #define preemption_enable() \
-        do { \
-                preemption_enable_noresched(); \
-                \
-                if (PREEMPTION_ENABLED && PREEMPTION_NEEDED) { \
-                        preemption_enabled_scheduler(); \
-                } \
-        } while (0)
-
-/** Restores preemption but never reschedules. */
-#define preemption_enable_noresched() \
         do { \
                 ASSERT(PREEMPTION_DISABLED); \
@@ -72 +60 @@
 
 
-extern void preemption_enabled_scheduler(void);
-extern void preemption_set_needed(void);
-extern void preemption_clear_needed(void);
-
 #endif