diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-12-11 02:46:31 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-12-11 02:46:31 +0100 |
| commit | 3107d81adec3a8002828032f860c8e5aa8b98aec (patch) | |
| tree | 17d32cf55c5020985c06a6d9d7f5f366caf73542 /i386 | |
| parent | 65479ae46bf058a89eb4e21478f8b4b592f335a9 (diff) | |
Fix boot under kvm in linux 4.3
* i386/i386/locore.S (discover_x86_cpu_type): Disable Cyrix CPU discovery.
Diffstat (limited to 'i386')
| -rw-r--r-- | i386/i386/locore.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/i386/i386/locore.S b/i386/i386/locore.S index cfda86f0..8cefbccb 100644 --- a/i386/i386/locore.S +++ b/i386/i386/locore.S @@ -1183,6 +1183,8 @@ ENTRY(discover_x86_cpu_type) movl %esp,%ebp /* Save stack pointer */ and $~0x3,%esp /* Align stack pointer */ +#if 0 +/* Seems to hang with kvm linux 4.3.0 */ #ifdef MACH_HYP #warning Assuming not Cyrix CPU #else /* MACH_HYP */ @@ -1190,6 +1192,7 @@ ENTRY(discover_x86_cpu_type) andb $0x80,%al /* ... in CCR4 reg bit7 */ outb %al,$0xe8 #endif /* MACH_HYP */ +#endif pushfl /* Fetch flags ... */ popl %eax /* ... into eax */ |