From 27ca68bcc430e491d05a06d9f0bca2899c72f896 Mon Sep 17 00:00:00 2001
From: Matias Zabaljauregui <zabaljauregui@gmail.com>
Date: Thu, 18 Jun 2009 11:44:06 -0300
Subject: [PATCH] --- yaml --- r: 155516 b: refs/heads/master c:
 5780888bcac316508eb5f4dd23bbea8b5057647c h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/x86/include/asm/lguest_hcall.h | 2 +-
 trunk/arch/x86/lguest/boot.c              | 2 +-
 trunk/drivers/char/tty_port.c             | 2 +-
 trunk/include/linux/lguest.h              | 2 +-
 trunk/kernel/trace/trace_functions.c      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index c19c1ca63cfc..c6980e1f8941 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b983d0deb0e28f8880cdea79def575d96a27e603
+refs/heads/master: 5780888bcac316508eb5f4dd23bbea8b5057647c
diff --git a/trunk/arch/x86/include/asm/lguest_hcall.h b/trunk/arch/x86/include/asm/lguest_hcall.h
index d31c4a684078..33600a66755f 100644
--- a/trunk/arch/x86/include/asm/lguest_hcall.h
+++ b/trunk/arch/x86/include/asm/lguest_hcall.h
@@ -30,7 +30,7 @@
 #include <asm/hw_irq.h>
 #include <asm/kvm_para.h>
 
-/*G:031 But first, how does our Guest contact the Host to ask for privileged
+/*G:030 But first, how does our Guest contact the Host to ask for privileged
  * operations?  There are two ways: the direct way is to make a "hypercall",
  * to make requests of the Host Itself.
  *
diff --git a/trunk/arch/x86/lguest/boot.c b/trunk/arch/x86/lguest/boot.c
index 7bc65f0f62c4..0188fd37b6c0 100644
--- a/trunk/arch/x86/lguest/boot.c
+++ b/trunk/arch/x86/lguest/boot.c
@@ -1079,7 +1079,7 @@ static unsigned lguest_patch(u8 type, u16 clobber, void *ibuf,
 	return insn_len;
 }
 
-/*G:030 Once we get to lguest_init(), we know we're a Guest.  The various
+/*G:029 Once we get to lguest_init(), we know we're a Guest.  The various
  * pv_ops structures in the kernel provide points for (almost) every routine we
  * have to override to avoid privileged instructions. */
 __init void lguest_init(void)
diff --git a/trunk/drivers/char/tty_port.c b/trunk/drivers/char/tty_port.c
index 9769b1149f76..4e862a75f7ff 100644
--- a/trunk/drivers/char/tty_port.c
+++ b/trunk/drivers/char/tty_port.c
@@ -267,7 +267,7 @@ int tty_port_block_til_ready(struct tty_port *port,
 	if (retval == 0)
 		port->flags |= ASYNC_NORMAL_ACTIVE;
 	spin_unlock_irqrestore(&port->lock, flags);
-	return retval;
+	return 0;
 	
 }
 EXPORT_SYMBOL(tty_port_block_til_ready);
diff --git a/trunk/include/linux/lguest.h b/trunk/include/linux/lguest.h
index 7bc1440fc473..dbf2479e808e 100644
--- a/trunk/include/linux/lguest.h
+++ b/trunk/include/linux/lguest.h
@@ -11,7 +11,7 @@
 #define LG_CLOCK_MIN_DELTA	100UL
 #define LG_CLOCK_MAX_DELTA	ULONG_MAX
 
-/*G:032 The second method of communicating with the Host is to via "struct
+/*G:031 The second method of communicating with the Host is to via "struct
  * lguest_data".  Once the Guest's initialization hypercall tells the Host where
  * this is, the Guest and Host both publish information in it. :*/
 struct lguest_data
diff --git a/trunk/kernel/trace/trace_functions.c b/trunk/kernel/trace/trace_functions.c
index 75ef000613c3..7402144bff21 100644
--- a/trunk/kernel/trace/trace_functions.c
+++ b/trunk/kernel/trace/trace_functions.c
@@ -363,7 +363,7 @@ ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable)
  out_reg:
 	ret = register_ftrace_function_probe(glob, ops, count);
 
-	return ret < 0 ? ret : 0;
+	return ret;
 }
 
 static struct ftrace_func_command ftrace_traceon_cmd = {