git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bluetooth: Fix double L2CAP connection request
[pandora-kernel.git]
/
kernel
/
printk.c
diff --git
a/kernel/printk.c
b/kernel/printk.c
index
7015733
..
e3602d0
100644
(file)
--- a/
kernel/printk.c
+++ b/
kernel/printk.c
@@
-73,7
+73,6
@@
EXPORT_SYMBOL(oops_in_progress);
* driver system.
*/
static DECLARE_MUTEX(console_sem);
* driver system.
*/
static DECLARE_MUTEX(console_sem);
-static DECLARE_MUTEX(secondary_console_sem);
struct console *console_drivers;
EXPORT_SYMBOL_GPL(console_drivers);
struct console *console_drivers;
EXPORT_SYMBOL_GPL(console_drivers);
@@
-382,7
+381,7
@@
out:
return error;
}
return error;
}
-
asmlinkage long sys_syslog(int type, char __user *buf, int
len)
+
SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int,
len)
{
return do_syslog(type, buf, len);
}
{
return do_syslog(type, buf, len);
}
@@
-742,11
+741,6
@@
EXPORT_SYMBOL(vprintk);
#else
#else
-asmlinkage long sys_syslog(int type, char __user *buf, int len)
-{
- return -ENOSYS;
-}
-
static void call_console_drivers(unsigned start, unsigned end)
{
}
static void call_console_drivers(unsigned start, unsigned end)
{
}
@@
-896,12
+890,14
@@
void suspend_console(void)
printk("Suspending console(s) (use no_console_suspend to debug)\n");
acquire_console_sem();
console_suspended = 1;
printk("Suspending console(s) (use no_console_suspend to debug)\n");
acquire_console_sem();
console_suspended = 1;
+ up(&console_sem);
}
void resume_console(void)
{
if (!console_suspend_enabled)
return;
}
void resume_console(void)
{
if (!console_suspend_enabled)
return;
+ down(&console_sem);
console_suspended = 0;
release_console_sem();
}
console_suspended = 0;
release_console_sem();
}
@@
-917,11
+913,9
@@
void resume_console(void)
void acquire_console_sem(void)
{
BUG_ON(in_interrupt());
void acquire_console_sem(void)
{
BUG_ON(in_interrupt());
- if (console_suspended) {
- down(&secondary_console_sem);
- return;
- }
down(&console_sem);
down(&console_sem);
+ if (console_suspended)
+ return;
console_locked = 1;
console_may_schedule = 1;
}
console_locked = 1;
console_may_schedule = 1;
}
@@
-931,6
+925,10
@@
int try_acquire_console_sem(void)
{
if (down_trylock(&console_sem))
return -1;
{
if (down_trylock(&console_sem))
return -1;
+ if (console_suspended) {
+ up(&console_sem);
+ return -1;
+ }
console_locked = 1;
console_may_schedule = 0;
return 0;
console_locked = 1;
console_may_schedule = 0;
return 0;
@@
-984,7
+982,7
@@
void release_console_sem(void)
unsigned wake_klogd = 0;
if (console_suspended) {
unsigned wake_klogd = 0;
if (console_suspended) {
- up(&
secondary_
console_sem);
+ up(&console_sem);
return;
}
return;
}