diff options
| author | Len Brown <len.brown@intel.com> | 2013-02-18 06:25:53 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2013-02-18 06:25:53 +0100 |
| commit | ca62cf59ceef10ff2ebca0e7f764507186870270 (patch) | |
| tree | 480ebfd5551db27052f501917a7e0314043c6778 /arch/x86/kernel/cpu/proc.c | |
| parent | Merge branches 'idle-remove-statedata', 'pm_idle' and 'idle-hsw-turbostat' in... (diff) | |
| parent | x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok flag (diff) | |
| download | linux-ca62cf59ceef10ff2ebca0e7f764507186870270.tar.xz linux-ca62cf59ceef10ff2ebca0e7f764507186870270.zip | |
Merge branch 'misc' into release
Conflicts:
arch/x86/kernel/process.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/kernel/cpu/proc.c')
| -rw-r--r-- | arch/x86/kernel/cpu/proc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c index 3286a92e662a..e280253f6f94 100644 --- a/arch/x86/kernel/cpu/proc.c +++ b/arch/x86/kernel/cpu/proc.c @@ -28,7 +28,6 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c) { seq_printf(m, "fdiv_bug\t: %s\n" - "hlt_bug\t\t: %s\n" "f00f_bug\t: %s\n" "coma_bug\t: %s\n" "fpu\t\t: %s\n" @@ -36,7 +35,6 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c) "cpuid level\t: %d\n" "wp\t\t: %s\n", c->fdiv_bug ? "yes" : "no", - c->hlt_works_ok ? "no" : "yes", c->f00f_bug ? "yes" : "no", c->coma_bug ? "yes" : "no", c->hard_math ? "yes" : "no", |