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
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
kernel
/
printk.c
diff --git
a/kernel/printk.c
b/kernel/printk.c
index
e651ab0
..
69188f2
100644
(file)
--- a/
kernel/printk.c
+++ b/
kernel/printk.c
@@
-382,7
+382,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);
}
@@
-619,7
+619,7
@@
static int acquire_console_semaphore_for_printk(unsigned int cpu)
static const char recursion_bug_msg [] =
KERN_CRIT "BUG: recent printk recursion!\n";
static int recursion_bug;
static const char recursion_bug_msg [] =
KERN_CRIT "BUG: recent printk recursion!\n";
static int recursion_bug;
-
static int new_text_line = 1;
+static int new_text_line = 1;
static char printk_buf[1024];
asmlinkage int vprintk(const char *fmt, va_list args)
static char printk_buf[1024];
asmlinkage int vprintk(const char *fmt, va_list args)
@@
-742,11
+742,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)
{
}