diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2002-11-05 17:17:11 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2002-11-05 17:17:11 +0000 |
| commit | d22ee938d657bd2cbcb66b508ba1883b55780b3b (patch) | |
| tree | 27e4fe837681878e9ccba865ac7fbafc80e9783c | |
| parent | 050796374b29c330ec800798a08336e8066bdd6f (diff) | |
| download | drakx-d22ee938d657bd2cbcb66b508ba1883b55780b3b.tar drakx-d22ee938d657bd2cbcb66b508ba1883b55780b3b.tar.gz drakx-d22ee938d657bd2cbcb66b508ba1883b55780b3b.tar.bz2 drakx-d22ee938d657bd2cbcb66b508ba1883b55780b3b.tar.xz drakx-d22ee938d657bd2cbcb66b508ba1883b55780b3b.zip | |
Revert last change
| -rw-r--r-- | perl-install/c/smp.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/perl-install/c/smp.c b/perl-install/c/smp.c index 3255ce9c4..baf786cc6 100644 --- a/perl-install/c/smp.c +++ b/perl-install/c/smp.c @@ -473,17 +473,6 @@ readEntry( void* entry, int size ) #endif /* __i386__ */ -static int sysconfDetectSMP(void) -{ - long nprocs; - - /* Error: assume we are *not* SMP. */ - if ((nprocs = sysconf(_SC_NPROCESSORS_ONLN)) < 0) - nprocs = 1; - - return nprocs > 1; -} - int detectSMP(void) { static int isSMP = -1; @@ -499,9 +488,12 @@ int detectSMP(void) return isSMP = alphaDetectSMP(); #elif __powerpc__ return isSMP = ppcDetectSMP(); -#elif defined(__ia64__) || defined(__x86_64__) - /* TODO: IA-64, maybe check against /proc/pal/cpuX ? */ - return isSMP = sysconfDetectSMP(); +#elif __ia64__ + /* TODO: Update to check against /proc/pal/cpuX */ + return isSMP = 1; +#elif __x86_64__ + /* TODO: Update when SMP machines are there */ + return isSMP = 0; #else #error unknown architecture #endif |