x86: notsc is ignored on common configurations

[Linux Kernel Mailing List]

Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7265b6f10deba1cbe071cee646b063bda07ecd68
Commit:     7265b6f10deba1cbe071cee646b063bda07ecd68
Parent:     f5106d91f2bf9153d6420f9ebb8114f73f9ce66a
Author:     Pavel Machek <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 19 11:02:30 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Tue Feb 26 12:55:54 2008 +0100

    x86: notsc is ignored on common configurations
    
    notsc is ignored in 32-bit kernels if CONFIG_X86_TSC is on.. which is
    bad, fix it.
    
    Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 arch/x86/kernel/tsc_32.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c
index 43517e3..f14cfd9 100644
--- a/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
@@ -28,7 +28,8 @@ EXPORT_SYMBOL_GPL(tsc_khz);
 static int __init tsc_setup(char *str)
 {
        printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, "
-                               "cannot disable TSC.\n");
+                               "cannot disable TSC completely.\n");
+       mark_tsc_unstable("user disabled TSC");
        return 1;
 }
 #else
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html