diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 00:35:07 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 00:35:07 +0000 |
| commit | ca2b53c30a3c2dea1d2610319ea0f4913ecae2e4 (patch) | |
| tree | 517264cd64f493b4abe59243171390dc9f665161 /fs | |
| parent | 2bab1036f931dad0ae1633669c92fb201b229789 (diff) | |
Make HZ_TO_STD macro name lowercase.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/binfmt_elf.c | 21 | ||||
| -rw-r--r-- | fs/proc/array.c | 16 |
2 files changed, 11 insertions, 26 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index d24db3010..100c3d195 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -220,7 +220,7 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex, if (interp_elf_ex->e_type != ET_EXEC && interp_elf_ex->e_type != ET_DYN) goto out; - if (!elf_check_arch(interp_elf_ex->e_machine)) + if (!elf_check_arch(interp_elf_ex)) goto out; if (!interpreter->f_op->mmap) goto out; @@ -405,23 +405,8 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs) if (elf_ex.e_type != ET_EXEC && elf_ex.e_type != ET_DYN) goto out; - if (!elf_check_arch(elf_ex.e_machine)) + if (!elf_check_arch(&elf_ex)) goto out; -#if defined(__mips__) && !defined(__mips64) - /* IRIX5 binaries handled elsewhere. */ - if (elf_ex.e_flags & EF_MIPS_ARCH) { - retval = -ENOEXEC; - goto out; - } -#endif -#if defined(__mips__) && defined(__mips64) - /* Linux/MIPS 32-bit binaries handled elsewhere. */ - if (sizeof(elf_caddr_t) == 8 && - elf_ex.e_ident[EI_CLASS] == ELFCLASS32) { - retval = -ENOEXEC; - goto out; - } -#endif if (!bprm->file->f_op||!bprm->file->f_op->mmap) goto out; @@ -794,7 +779,7 @@ static int load_elf_library(struct file *file) /* First of all, some simple consistency checks */ if (elf_ex.e_type != ET_EXEC || elf_ex.e_phnum > 2 || - !elf_check_arch(elf_ex.e_machine) || !file->f_op->mmap) + !elf_check_arch(&elf_ex) || !file->f_op->mmap) goto out; /* Now read in all of the header information */ diff --git a/fs/proc/array.c b/fs/proc/array.c index 535c8c527..22c9af395 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -366,10 +366,10 @@ int proc_pid_stat(struct task_struct *task, char * buffer) task->cmin_flt, task->maj_flt, task->cmaj_flt, - HZ_TO_STD(task->times.tms_utime), - HZ_TO_STD(task->times.tms_stime), - HZ_TO_STD(task->times.tms_cutime), - HZ_TO_STD(task->times.tms_cstime), + hz_to_std(task->times.tms_utime), + hz_to_std(task->times.tms_stime), + hz_to_std(task->times.tms_cutime), + hz_to_std(task->times.tms_cstime), priority, nice, 0UL /* removed */, @@ -688,14 +688,14 @@ int proc_pid_cpu(struct task_struct *task, char * buffer) len = sprintf(buffer, "cpu %lu %lu\n", - HZ_TO_STD(task->times.tms_utime), - HZ_TO_STD(task->times.tms_stime)); + hz_to_std(task->times.tms_utime), + hz_to_std(task->times.tms_stime)); for (i = 0 ; i < smp_num_cpus; i++) len += sprintf(buffer + len, "cpu%d %lu %lu\n", i, - HZ_TO_STD(task->per_cpu_utime[cpu_logical_map(i)]), - HZ_TO_STD(task->per_cpu_stime[cpu_logical_map(i)])); + hz_to_std(task->per_cpu_utime[cpu_logical_map(i)]), + hz_to_std(task->per_cpu_stime[cpu_logical_map(i)])); return len; } |