From dced5adf106394adf66f02d01fb0209a5d9c8844 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sat, 18 Apr 2009 23:51:08 +0200 Subject: [PATCH] --- yaml --- r: 143709 b: refs/heads/master c: f14875a3e0cc35d7dbe15ee39763a6ae922e7034 h: refs/heads/master i: 143707: 08cbf5cf49bd7444e444636f59c50ee8e8ad0eab v: v3 --- [refs] | 2 +- trunk/.gitignore | 1 + trunk/Makefile | 2 +- trunk/drivers/char/vt.c | 2 +- trunk/fs/namespace.c | 5 ++--- trunk/include/linux/seccomp.h | 2 -- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 2eeef2a822c0..d316c6fbabdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0b7988200a82290287c6f4cd49585007f73175a +refs/heads/master: f14875a3e0cc35d7dbe15ee39763a6ae922e7034 diff --git a/trunk/.gitignore b/trunk/.gitignore index 869e1a3b64b6..51bd99d6a260 100644 --- 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 index bfdef56add34..6f4208ff2d10 100644 --- 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 index 08151d4de489..2c1d133819b5 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 d9138f81ec10..c6f54e4c4290 100644 --- 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 index 167c33361d9c..262a8dccfa81 100644 --- 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 - typedef struct { } seccomp_t; #define secure_computing(x) do { } while (0)