--- Begin Message ---
Subject: linux-image-2.6.26-1-686: Kernel will not boot in Virtual PC
Package: linux-image-2.6.26-1-686
Version: 2.6.26-5
Severity: important
Tags: patch
*** Please type your report below this line ***
Kernel will not boot in Virtual PC due to introduction of multi-byte
nops. Problem has been fixed upstream for 2.6.27. I am including patch
to fix problem in 2.6.26-1-686.
-- Package-specific info:
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.27-rc8.local2 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages linux-image-2.6.26-1-686 depends on:
ii debconf [debconf-2.0] 1.5.22 Debian configuration management sy
ii initramfs-tools [linux-initra 0.92j tools for generating an initramfs
ii module-init-tools 3.4-1 tools for managing Linux kernel mo
Versions of packages linux-image-2.6.26-1-686 recommends:
ii libc6-i686 2.7-13 GNU C Library: Shared libraries [i
Versions of packages linux-image-2.6.26-1-686 suggests:
ii grub 0.97-47 GRand Unified Bootloader (Legacy v
pn linux-doc-2.6.26 <none> (no description available)
-- debconf information:
linux-image-2.6.26-1-686/preinst/abort-overwrite-2.6.26-1-686:
shared/kernel-image/really-run-bootloader: true
linux-image-2.6.26-1-686/postinst/bootloader-error-2.6.26-1-686:
linux-image-2.6.26-1-686/postinst/depmod-error-initrd-2.6.26-1-686: false
linux-image-2.6.26-1-686/prerm/removing-running-kernel-2.6.26-1-686: true
linux-image-2.6.26-1-686/postinst/old-system-map-link-2.6.26-1-686: true
linux-image-2.6.26-1-686/preinst/abort-install-2.6.26-1-686:
linux-image-2.6.26-1-686/preinst/lilo-has-ramdisk:
linux-image-2.6.26-1-686/preinst/bootloader-initrd-2.6.26-1-686: true
linux-image-2.6.26-1-686/prerm/would-invalidate-boot-loader-2.6.26-1-686: true
linux-image-2.6.26-1-686/preinst/elilo-initrd-2.6.26-1-686: true
linux-image-2.6.26-1-686/postinst/kimage-is-a-directory:
linux-image-2.6.26-1-686/postinst/old-dir-initrd-link-2.6.26-1-686: true
linux-image-2.6.26-1-686/postinst/create-kimage-link-2.6.26-1-686: true
linux-image-2.6.26-1-686/preinst/lilo-initrd-2.6.26-1-686: true
linux-image-2.6.26-1-686/postinst/old-initrd-link-2.6.26-1-686: true
linux-image-2.6.26-1-686/preinst/overwriting-modules-2.6.26-1-686: true
linux-image-2.6.26-1-686/postinst/depmod-error-2.6.26-1-686: false
linux-image-2.6.26-1-686/postinst/bootloader-test-error-2.6.26-1-686:
linux-image-2.6.26-1-686/preinst/failed-to-move-modules-2.6.26-1-686:
linux-image-2.6.26-1-686/preinst/initrd-2.6.26-1-686:
>From 14469a8dd23677921db5e7354a602c98d9c6300f Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Sep 2008 09:30:14 -0700
Subject: [PATCH] x86: disable static NOPLs on 32 bits
On 32-bit, at least the generic nops are fairly reasonable, but the
default nops for 64-bit really look pretty sad, and the P6 nops really do
look better.
So I would suggest perhaps moving the static P6 nop selection into the
CONFIG_X86_64 thing.
The alternative is to just get rid of that static nop selection, and just
have two cases: 32-bit and 64-bit, and just pick obviously safe cases for
them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/Kconfig.cpu | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 2c518fb..b225219 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -382,14 +382,17 @@ config X86_OOSTORE
# P6_NOPs are a relatively minor optimization that require a family >=
# 6 processor, except that it is broken on certain VIA chips.
# Furthermore, AMD chips prefer a totally different sequence of NOPs
-# (which work on all CPUs). As a result, disallow these if we're
-# compiling X86_GENERIC but not X86_64 (these NOPs do work on all
-# x86-64 capable chips); the list of processors in the right-hand clause
-# are the cores that benefit from this optimization.
+# (which work on all CPUs). In addition, it looks like Virtual PC
+# does not understand them.
+#
+# As a result, disallow these if we're not compiling for X86_64 (these
+# NOPs do work on all x86-64 capable chips); the list of processors in
+# the right-hand clause are the cores that benefit from this optimization.
#
config X86_P6_NOP
def_bool y
- depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC)
+ depends on X86_64
+ depends on (MCORE2 || MPENTIUM4 || MPSC)
config X86_TSC
def_bool y
--
1.6.0.2.GIT
--- End Message ---