Changeset c621f4aa in mainline for kernel/generic/src/preempt/preemption.c

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

File:

• kernel/generic/src/preempt/preemption.c (modified) (2 diffs)

kernel/generic/src/preempt/preemption.c

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
 
 /**
- * @file        preemption.c
- * @brief       Preemption control.
+ * @file preemption.c
+ * @brief Preemption control.
  */
- 
+
 #include <preemption.h>
 #include <arch.h>
@@ -52 +52 @@
 void preemption_enable(void)
 {
-        ASSERT(THE->preemption_disabled);
+        ASSERT(PREEMPTION_DISABLED);
         memory_barrier();
         THE->preemption_disabled--;