Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6] / kernel / seccomp.c

diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index 1dfa8a50972612e6d1b0ef6118a1fabbea2a937a..ad64fcb731f231d22e539d0e1b094cdd59c7d759 100644 (file)
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -74,6 +74,9 @@ long prctl_set_seccomp(unsigned long seccomp_mode)
        if (seccomp_mode && seccomp_mode <= NR_SECCOMP_MODES) {
                current->seccomp.mode = seccomp_mode;
                set_thread_flag(TIF_SECCOMP);
+#ifdef TIF_NOTSC
+               disable_TSC();
+#endif
                ret = 0;
        }