diff options
Diffstat (limited to 'include/asm-arm/procinfo.h')
| -rw-r--r-- | include/asm-arm/procinfo.h | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/include/asm-arm/procinfo.h b/include/asm-arm/procinfo.h index a89b7509f..8c11dfd80 100644 --- a/include/asm-arm/procinfo.h +++ b/include/asm-arm/procinfo.h @@ -1,34 +1,45 @@ /* * linux/include/asm-arm/procinfo.h * - * Copyright (C) 1996 Russell King + * Copyright (C) 1996-1999 Russell King */ - #ifndef __ASM_PROCINFO_H #define __ASM_PROCINFO_H -#include <asm/proc-fns.h> - #ifndef __ASSEMBLER__ -#define HWCAP_SWP (1 << 0) -#define HWCAP_HALF (1 << 1) - -struct armversions { - const unsigned long id; /* Processor ID */ - const unsigned long mask; /* Processor ID mask */ - const char *manu; /* Manufacturer */ - const char *name; /* Processor name */ - const char *arch_vsn; /* Architecture version */ - const char *elf_vsn; /* ELF library version */ - const int hwcap; /* ELF HWCAP */ - const struct processor *proc; /* Processor-specific ASM */ +#include <asm/proc-fns.h> + +struct proc_info_item { + const char *manufacturer; + const char *cpu_name; }; -extern const struct armversions armidlist[]; -extern int armidindex; +/* + * Note! struct processor is always defined if we're + * using MULTI_CPU, otherwise this entry is unused, + * but still exists. + */ +struct proc_info_list { + unsigned int cpu_val; + unsigned int cpu_mask; + const char *arch_name; + const char *elf_name; + unsigned int elf_hwcap; + struct proc_info_item *info; +#ifdef MULTI_CPU + struct processor *proc; +#else + void *unused; +#endif +}; #endif +#define HWCAP_SWP 1 +#define HWCAP_HALF 2 +#define HWCAP_THUMB 4 +#define HWCAP_26BIT 8 /* Play it safe */ + #endif |