emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Linux 2.2 non-SMP on SMP Alpha needed this

Browse Source
This commit is contained in:
albert 2004-08-10 07:18:04 +00:00
parent 1e1ec4ad84
commit 792358ba42
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
proc/sysinfo.c
View File

@ -191,16 +191,20 @@ static unsigned long find_elf_note(unsigned long findme){
static void init_libproc(void) __attribute__((constructor)); static void init_libproc(void) __attribute__((constructor));
static void init_libproc(void){ static void init_libproc(void){
/* ought to count CPUs in /proc/stat instead of relying // ought to count CPUs in /proc/stat instead of relying
* on glibc, which foolishly tries to parse /proc/cpuinfo // on glibc, which foolishly tries to parse /proc/cpuinfo
*/ //
smp_num_cpus = sysconf(_SC_NPROCESSORS_CONF); // or _SC_NPROCESSORS_ONLN // SourceForge has an old Alpha running Linux 2.2.20 that
// appears to have a non-SMP kernel on a 2-way SMP box.
// _SC_NPROCESSORS_CONF returns 2, resulting in HZ=512
// _SC_NPROCESSORS_ONLN returns 1, which should work OK
smp_num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */ if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */
if(linux_version_code > LINUX_VERSION(2, 4, 0)){ if(linux_version_code > LINUX_VERSION(2, 4, 0)){
Hertz = find_elf_note(AT_CLKTCK); Hertz = find_elf_note(AT_CLKTCK);
if(Hertz!=NOTE_NOT_FOUND) return; if(Hertz!=NOTE_NOT_FOUND) return;
fprintf(stderr, "2.4 kernel w/o ELF notes? -- report to albert@users.sf.net\n"); fprintf(stderr, "2.4 kernel w/o ELF notes? -- report this\n");
} }
old_Hertz_hack(); old_Hertz_hack();
} }