From 8c364b81e4103a44979ea34a4a7473c62a0b70c5 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Apr 2009 10:54:06 -0700
Subject: [PATCH] --- yaml --- r: 143711 b: refs/heads/master c:
 091ccb006fcf5c4aa1283901ca6e62ff85b3a569 h: refs/heads/master i:   143709:
 dced5adf106394adf66f02d01fb0209a5d9c8844   143707:
 08cbf5cf49bd7444e444636f59c50ee8e8ad0eab   143703:
 145bfe10f03edfc0e685097172b10b47d4ab4656   143695:
 6c3d97a50e862d4e301e025d00df2f5976f871b6   143679:
 8eff933d57f48405d29fe56f905efa55e1ae8087 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/vt.c       | 2 +-
 trunk/fs/namespace.c          | 5 +++--
 trunk/include/linux/seccomp.h | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f7c557ac64dd..fc095e0835ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 720097d895956c0bf15b8440f7845159a04b74da
+refs/heads/master: 091ccb006fcf5c4aa1283901ca6e62ff85b3a569
diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c
index 2c1d133819b5..08151d4de489 100644
--- a/trunk/drivers/char/vt.c
+++ b/trunk/drivers/char/vt.c
@@ -2274,7 +2274,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
 				    continue; /* nothing to display */
 				}
 				/* Glyph not found */
-				if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) {
+				if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) {
 				    /* In legacy mode use the glyph we get by a 1:1 mapping.
 				       This would make absolutely no sense with Unicode in mind,
 				       but do this for ASCII characters since a font may lack
diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c
index c6f54e4c4290..d9138f81ec10 100644
--- a/trunk/fs/namespace.c
+++ b/trunk/fs/namespace.c
@@ -1920,8 +1920,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
 	if (data_page)
 		((char *)data_page)[PAGE_SIZE - 1] = 0;
 
-	/* Default to relatime */
-	mnt_flags |= MNT_RELATIME;
+	/* Default to relatime unless overriden */
+	if (!(flags & MS_NOATIME))
+		mnt_flags |= MNT_RELATIME;
 
 	/* Separate the per-mountpoint flags */
 	if (flags & MS_NOSUID)
diff --git a/trunk/include/linux/seccomp.h b/trunk/include/linux/seccomp.h
index 262a8dccfa81..167c33361d9c 100644
--- a/trunk/include/linux/seccomp.h
+++ b/trunk/include/linux/seccomp.h
@@ -21,6 +21,8 @@ extern long prctl_set_seccomp(unsigned long);
 
 #else /* CONFIG_SECCOMP */
 
+#include <linux/errno.h>
+
 typedef struct { } seccomp_t;
 
 #define secure_computing(x) do { } while (0)