Skip to content

Commit

Permalink
Revert "console: implement lockdep support for console_lock"
Browse files Browse the repository at this point in the history
This reverts commit daee779.

I'll requeue this after the console locking fixes, so lockdep
is useful again for people until fbcon is fixed.

Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Dave Airlie committed Jan 31, 2013
1 parent 2e51b23 commit ff0d05b
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,6 @@ static DEFINE_SEMAPHORE(console_sem);
struct console *console_drivers;
EXPORT_SYMBOL_GPL(console_drivers);

#ifdef CONFIG_LOCKDEP
static struct lockdep_map console_lock_dep_map = {
.name = "console_lock"
};
#endif

/*
* This is used for debugging the mess that is the VT code by
* keeping track if we have the console semaphore held. It's
Expand Down Expand Up @@ -1924,7 +1918,6 @@ void console_lock(void)
return;
console_locked = 1;
console_may_schedule = 1;
mutex_acquire(&console_lock_dep_map, 0, 0, _RET_IP_);
}
EXPORT_SYMBOL(console_lock);

Expand All @@ -1946,7 +1939,6 @@ int console_trylock(void)
}
console_locked = 1;
console_may_schedule = 0;
mutex_acquire(&console_lock_dep_map, 0, 1, _RET_IP_);
return 1;
}
EXPORT_SYMBOL(console_trylock);
Expand Down Expand Up @@ -2107,7 +2099,6 @@ void console_unlock(void)
local_irq_restore(flags);
}
console_locked = 0;
mutex_release(&console_lock_dep_map, 1, _RET_IP_);

/* Release the exclusive_console once it is used */
if (unlikely(exclusive_console))
Expand Down

0 comments on commit ff0d05b

Please sign in to comment.