---

yaml --- r: 143709 b: refs/heads/master c: f14875a h: refs/heads/master i: 143707: 08cbf5c v: v3
git-mirror · Apr 19, 2009 · dced5ad · dced5ad
1 parent 37ea938
commit dced5ad
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0b7988200a82290287c6f4cd49585007f73175a
+refs/heads/master: f14875a3e0cc35d7dbe15ee39763a6ae922e7034
diff --git a/trunk/.gitignore b/trunk/.gitignore
@@ -49,6 +49,7 @@ include/linux/compile.h
 include/linux/version.h
 include/linux/utsrelease.h
 include/linux/bounds.h
+include/generated
 
 # stgit generated dirs
 patches-*

diff --git a/trunk/Makefile b/trunk/Makefile
@@ -1200,7 +1200,7 @@ CLEAN_FILES +=	vmlinux System.map \
                 .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
 
 # Directories & files removed with 'make mrproper'
-MRPROPER_DIRS  += include/config include2 usr/include
+MRPROPER_DIRS  += include/config include2 usr/include include/generated
 MRPROPER_FILES += .config .config.old include/asm .version .old_version \
                   include/linux/autoconf.h include/linux/version.h      \
                   include/linux/utsrelease.h                            \

diff --git 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
@@ -1920,9 +1920,8 @@ 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 unless overriden */
-	if (!(flags & MS_NOATIME))
-		mnt_flags |= MNT_RELATIME;
+	/* Default to relatime */
+	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
@@ -21,8 +21,6 @@ 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)