index
:
drakx
distro/mdv2007.1
distro/mdv2008.0
distro/mdv2008.1
distro/mdv2009.0
distro/mdv2009.1
distro/mdv2010.0
distro/mes5
distro/mes5-2.6.33
distro/mes6
distro/mga1
distro/mga2
distro/mga3
distro/mga4
distro/mga5
distro/mga6
distro/mga7
distro/mga8
distro/mga9
master
topic/Corpo_2_1
topic/KA9_0
topic/MDK-10-update
topic/MDK-10_1-update
topic/MDK-10_2-update
topic/MDK-2006_0-update
topic/MDK92-branch
topic/MDKC_1_0
topic/PCMCIA_CS_DISTRO
topic/R9_0-64bit-branch
topic/R9_1_HP-branch
topic/a
topic/before_matchbox_wm
topic/bug-13680
topic/dietlibc
topic/efi
topic/extlinux
topic/firewall
topic/gdk-pixbuf-0-branch
topic/gi-ppc
topic/ia64-8_1
topic/mandrakesoft
topic/mlcd4
topic/ppp
topic/rp-pppoe
topic/switching_to_dnf
topic/switching_to_urpmi
topic/unlabeled-1.1.1
topic/v_webmin_0_87
topic/x86_64-branch
user/animtim/designWork
user/colin/rescue-systemd
user/ennael/mga6
user/erwan/bug-13680
user/jibz/aarch64
user/martinw/mga6
user/pterjan/arm64
Mageia Installer and base platform for many utilities
Thierry Vignaud [tv]
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
- if(/*Processor Manufacturer*/(data[7] != 0) &&
- (strncmp(dmi_processor_family(data[6]),"Unknown",7) != 0) && (data[6] != 0))
+ if(/*Processor Manufacturer*/data[7] != 0)
processor++;
}
@@ -174,11 +173,6 @@ static int dmi_table(int fd, u32 base, int len, int num)
return processor;
}
-int main(int argc, char *argv[])
-{
- return intelDetectSMP();
-}
-
int intelDetectSMP(void) {
unsigned char buf[20];
int fd=open("/dev/mem", O_RDONLY);
@@ -215,5 +209,5 @@ int intelDetectSMP(void) {
}
}
close(fd);
- return processor;
+ return (processor > 1);
}
diff --git a/perl-install/c/smp.c b/perl-install/c/smp.c
index 4e0ed354a..7e25302d1 100644
--- a/
perl-install/c/smp.c
+++ b/
perl-install/c/smp.c
@@ -244,7 +244,8 @@ readType()
extern int intelDetectSMP(void);
-static int intelDetectSMP_old(void)
+// old detection
+static int intelDetectSMP_mptable(void)
{
vm_offset_t paddr;
int where;
@@ -483,7 +484,7 @@ int detectSMP(void)
return isSMP;
#ifdef __i386__
- return isSMP = intelDetectSMP();
+ return isSMP = intelDetectSMP() || intelDetectSMP_mptable();
#elif __sparc__
return isSMP = sparcDetectSMP();
#elif __alpha__
