3 files changed, 11 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index dbe699751..f7fac488d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -5,6 +5,8 @@
 - harddrake:
   o use acpi-cpufreq for Mobile PIII/Celeron
     (family 6 model 11, for example Toshiba Portégé 3500)
+  o use speedstep-centrino only for supported models
+    and prefer acpi-cpufreq (patch from Herton, #30208)
 
 Version 10.6.18 - 12 February 2008
 
diff --git a/perl-install/cpufreq.pm b/perl-install/cpufreq.pm
index a55e7b766..fe4e6431e 100644
--- a/perl-install/cpufreq.pm
+++ b/perl-install/cpufreq.pm
@@ -43,8 +43,7 @@ sub probe_acpi_cpufreq() {
         get_vendor($_) eq "Intel" &&
         $_->{'cpu family'} == 6 &&
         (
-            has_flag($_, 'est') && member($_->{model}, 13, 15)
-            ||
+            has_flag($_, 'est') ||
             $_->{model} == 11
         );
     } get_cpus();
@@ -54,8 +53,11 @@ sub probe_centrino() {
     any {
         get_vendor($_) eq "Intel" &&
         has_flag($_, 'est') && (
-            $_->{'cpu family'} == 6 && member($_->{model}, 9, 14) ||
-            $_->{'cpu family'} == 15 && member($_->{model}, 3, 4)
+            ($_->{'cpu family'} == 6 && $_->{model} == 9 && $_->{stepping} == 5 &&
+             $_->{'model name'} =~ /^Intel\(R\) Pentium\(R\) M processor ( 900|1[0-7]00)MHz$/) ||
+            ($_->{'cpu family'} == 6 && $_->{model} == 13 && member($_->{stepping}, 1, 2, 6)) ||
+            ($_->{'cpu family'} == 15 && $_->{model} == 3 && $_->{stepping} == 4) ||
+            ($_->{'cpu family'} == 15 && $_->{model} == 4 && $_->{stepping} == 1)
         );
     } get_cpus();
 }
@@ -126,10 +128,10 @@ sub probe_longrun() {
 }
 
 my @modules = (
-    [ "acpi-cpufreq", \&probe_acpi_cpufreq ],
     # probe centrino first, it will get detected on ICH chipset and
     # speedstep-ich doesn't work with it
     [ "speedstep-centrino", \&probe_centrino ],
+    [ "acpi-cpufreq", \&probe_acpi_cpufreq ],
     # try to find cpufreq compliant northbridge
     [ "speedstep-ich", \&probe_ich ],
     [ "speedstep-smi", \&probe_smi ],
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 270f4554e..83e09e255 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -7,6 +7,8 @@
 - cpufreq:
   o use acpi-cpufreq for Mobile PIII/Celeron
     (family 6 model 11, for example Toshiba Portégé 3500)
+  o use speedstep-centrino only for supported models
+    and prefer acpi-cpufreq (patch from Herton, #30208)
 
 Version 10.6.19 - 12 February 2008