summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-04-02 15:05:21 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-04-02 15:05:21 +0000
commit9711794880f0f645b27badf01f892ac601e1fa79 (patch)
tree9de54ac85d66e96032b3294a32733cdcd12ae3e4
parentf3bf9801305923a41b296f1e016b2b665bc1330b (diff)
downloaddrakx-9711794880f0f645b27badf01f892ac601e1fa79.tar
drakx-9711794880f0f645b27badf01f892ac601e1fa79.tar.gz
drakx-9711794880f0f645b27badf01f892ac601e1fa79.tar.bz2
drakx-9711794880f0f645b27badf01f892ac601e1fa79.tar.xz
drakx-9711794880f0f645b27badf01f892ac601e1fa79.zip
Update to match IA-64 ACPI format string "XXX CPUs available"
-rw-r--r--perl-install/detect_devices.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 05e7eaccb..39c86f38e 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -479,9 +479,9 @@ sub get_mac_generation() {
}
sub hasSMP {
- # Much simpler if we have APIC stuff
+ # Much simpler if we have APIC/ACPI stuff
foreach (syslog()) {
- my ($nprocs) = m/Processors: (\d+)/ or next;
+ my ($nprocs) = (m/Processors: (\d+)/ || m/(\d+) CPUs avail/) or next;
return $nprocs > 1 ? 1 : 0;
}
c::detectSMP()