Bug#504095: installation-report: xen paravirt installation
On Fri, 2008-10-31 at 15:38 +0000, Ian Campbell wrote:
> > So to me it seems the workaround can be removed:
> > * removed for VIA Ester altogeher
> > * removed vor VIA Nehemiah once we ship 2.6.27
>
> Do you happen to know the Family/Model for the Nehemiah?
>
> Your cpuinfo shows that Esther is Family 6 model 9.
>
> Perhaps Nehemiah is model 10 since that is the other model removed by
> the patch?
>
Pardon me, Esther is Family 6 model 10 (I read stepping field by
mistake). #492751 shows that Nehemiah is Family 6 model 9.
I think we should revert the problematic changeset and instead only use
486 for model 9 leaving model 10 with 686. e.g.
diff --git a/packages/base-installer/debian/changelog b/packages/base-installer/debian/changelog
index 59404b5..5fd1b4c 100644
--- a/packages/base-installer/debian/changelog
+++ b/packages/base-installer/debian/changelog
@@ -1,3 +1,12 @@
+base-installer (1.99) UNRELEASED; urgency=low
+
+ [ Ian Campbell ]
+ * i386: Use -686 flavour for CentaurHauls "Esther" (model 10) processors.
+ Only the "Nehemiah" (model 9) processors do not support long NOP
+ instructions. Closes: #504095
+
+ --
+
base-installer (1.98) unstable; urgency=low
[ Colin Watson ]
diff --git a/packages/base-installer/kernel/i386.sh b/packages/base-installer/kernel/i386.sh
index cba6d9b..e8929ea 100644
--- a/packages/base-installer/kernel/i386.sh
+++ b/packages/base-installer/kernel/i386.sh
@@ -36,10 +36,17 @@ arch_get_kernel_flavour () {
esac
;;
" CentaurHauls")
- # x86 VIA Nehemiah CentaurHauls does not boot with -686
- # since 2.6.22+ since they lack long NOP instructions.
- # See: http://lkml.org/lkml/2008/7/22/263
- echo 486 ;;
+ case "$FAMILY" in
+ " 6")
+ case "$MODEL" in
+ " 10") echo 686$BIGMEM ;;
+ *) echo 486 ;;
+ esac
+ ;;
+ *)
+ echo 486 ;;
+ esac
+ ;;
*)
echo 486 ;;
esac
--
Ian Campbell
Current Noise: Nebula - Decadent Garden
One picture is worth 128K words.
Reply to: