git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-i386
/
bugs.h
diff --git
a/include/asm-i386/bugs.h
b/include/asm-i386/bugs.h
index
50233e0
..
38f1aeb
100644
(file)
--- a/
include/asm-i386/bugs.h
+++ b/
include/asm-i386/bugs.h
@@
-17,11
+17,11
@@
* void check_bugs(void);
*/
* void check_bugs(void);
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <asm/processor.h>
#include <asm/i387.h>
#include <asm/msr.h>
#include <linux/init.h>
#include <asm/processor.h>
#include <asm/i387.h>
#include <asm/msr.h>
+#include <asm/paravirt.h>
static int __init no_halt(char *s)
{
static int __init no_halt(char *s)
{
@@
-92,6
+92,9
@@
static void __init check_fpu(void)
static void __init check_hlt(void)
{
static void __init check_hlt(void)
{
+ if (paravirt_enabled())
+ return;
+
printk(KERN_INFO "Checking 'hlt' instruction... ");
if (!boot_cpu_data.hlt_works_ok) {
printk("disabled\n");
printk(KERN_INFO "Checking 'hlt' instruction... ");
if (!boot_cpu_data.hlt_works_ok) {
printk("disabled\n");
@@
-190,6
+193,6
@@
static void __init check_bugs(void)
check_fpu();
check_hlt();
check_popad();
check_fpu();
check_hlt();
check_popad();
-
system_utsname.
machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
+
init_utsname()->
machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
alternative_instructions();
}
alternative_instructions();
}