Merge git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6-omap-h63xx.git] / arch / frv / kernel / semaphore.c

diff --git a/arch/frv/kernel/semaphore.c b/arch/frv/kernel/semaphore.c
index 5cba9c1f2b3dcf2c01579528f878f44ce88fbc90..7ee3a147b47143cefb3b8c184727edaf933c1117 100644 (file)
--- a/arch/frv/kernel/semaphore.c
+++ b/arch/frv/kernel/semaphore.c
@@ -10,7 +10,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/module.h>
 #include <asm/semaphore.h>
@@ -20,7 +19,7 @@ struct sem_waiter {
        struct task_struct      *task;
 };
 
-#if SEM_DEBUG
+#ifdef CONFIG_DEBUG_SEMAPHORE
 void semtrace(struct semaphore *sem, const char *str)
 {
        if (sem->debug)
@@ -140,7 +139,7 @@ void __up(struct semaphore *sem)
        waiter = list_entry(sem->wait_list.next, struct sem_waiter, list);
 
        /* We must be careful not to touch 'waiter' after we set ->task = NULL.
-        * It is an allocated on the waiter's stack and may become invalid at
+        * It is allocated on the waiter's stack and may become invalid at
         * any time after that point (due to a wakeup from another source).
         */
        list_del_init(&waiter->list);