From 87ef78ed082f9dec4e83a6120b32617b7f7a86b9 Mon Sep 17 00:00:00 2001
From: Mystery Man <unknown@mandriva.org>
Date: Thu, 24 Apr 2003 07:15:38 +0000
Subject: This commit was manufactured by cvs2svn to create tag 'V1_1_9_56mdk'.

---
 perl-install/detect_devices.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'perl-install/detect_devices.pm')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index c60e356c2..383844143 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -478,7 +478,15 @@ sub get_mac_generation() {
     return "Unknown Generation";	
 }
 
-sub hasSMP { c::detectSMP() }
+sub hasSMP {
+    # Much simpler if we have APIC/ACPI stuff
+    foreach (syslog()) {
+        my $nprocs = (m/(^Processors: (\d+)|(\d+) CPUs avail)/)[1] or next;
+        return $nprocs > 1 ? 1 : 0;
+    }
+    c::detectSMP()
+}
+
 sub hasPCMCIA { $::o->{pcmcia} } #- because /proc/pcmcia seems not to be present on 2.4 at least (or use /var/run/stab)
 
 #- try to detect a laptop, we assume pcmcia service is an indication of a laptop or
-- 
cgit v1.2.1