Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[~andy/linux] / kernel / semaphore.c

diff --git a/kernel/semaphore.c b/kernel/semaphore.c
index 1a064adab658cbacc72c2fe8a88ab7e6f3a2efeb..aaaeae8244e77aa7dffd26ff935e7e3260c58a97 100644 (file)
--- a/kernel/semaphore.c
+++ b/kernel/semaphore.c
@@ -54,7 +54,6 @@ void down(struct semaphore *sem)
 {
        unsigned long flags;
 
-       ftrace_special(sem->count, 0, __LINE__);
        spin_lock_irqsave(&sem->lock, flags);
        if (likely(sem->count > 0))
                sem->count--;