From 6547cd0a5530204ea04788c4b17d6980073df1a7 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sun, 19 Jul 2009 14:46:09 +0300 Subject: [PATCH] --- yaml --- r: 156089 b: refs/heads/master c: f294526279cda8934b0313ebd02184a16ba888c9 h: refs/heads/master i: 156087: 2e973d7aafa700fd3ec02abc393309d7c32db711 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 7 +++++-- trunk/drivers/lguest/lguest_user.c | 5 +++-- trunk/kernel/kprobes.c | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a7b7aabb0dd0..3f93b54a03cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec30c5f3a18722f8fcf8c83146a10b03ac4d9ff1 +refs/heads/master: f294526279cda8934b0313ebd02184a16ba888c9 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 79471ba4981b..66a3865da88d 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -155,9 +155,10 @@ S: Maintained F: drivers/net/r8169.c 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER +M: Alan Cox L: linux-serial@vger.kernel.org W: http://serial.sourceforge.net -S: Orphan +S: Odd Fixes F: drivers/serial/8250* F: include/linux/serial_8250.h @@ -4996,7 +4997,9 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git S: Maintained TTY LAYER -S: Orphan +M: Alan Cox +S: Maintained +T: stgit http://zeniv.linux.org.uk/~alan/ttydev/ F: drivers/char/tty_* F: drivers/serial/serial_core.c F: include/linux/serial_core.h diff --git a/trunk/drivers/lguest/lguest_user.c b/trunk/drivers/lguest/lguest_user.c index 9f9a2953b383..407722a8e0c4 100644 --- a/trunk/drivers/lguest/lguest_user.c +++ b/trunk/drivers/lguest/lguest_user.c @@ -52,8 +52,9 @@ static int add_eventfd(struct lguest *lg, unsigned long addr, int fd) new->map[new->num].addr = addr; new->map[new->num].event = eventfd_ctx_fdget(fd); if (IS_ERR(new->map[new->num].event)) { + int err = PTR_ERR(new->map[new->num].event); kfree(new); - return PTR_ERR(new->map[new->num].event); + return err; } new->num++; @@ -83,7 +84,7 @@ static int attach_eventfd(struct lguest *lg, const unsigned long __user *input) err = add_eventfd(lg, addr, fd); mutex_unlock(&lguest_lock); - return 0; + return err; } /*L:050 Sending an interrupt is done by writing LHREQ_IRQ and an interrupt diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c index 0540948e29ab..16b5739c516a 100644 --- a/trunk/kernel/kprobes.c +++ b/trunk/kernel/kprobes.c @@ -694,7 +694,7 @@ int __kprobes register_kprobe(struct kprobe *p) p->addr = addr; preempt_disable(); - if (!kernel_text_address((unsigned long) p->addr) || + if (!__kernel_text_address((unsigned long) p->addr) || in_kprobes_functions((unsigned long) p->addr)) { preempt_enable(); return -EINVAL;