patch-2.2.18 linux/include/asm-arm/procinfo.h

• Lines: 64
• Date: Fri Sep 15 23:32:34 2000
• Orig file: v2.2.17/include/asm-arm/procinfo.h
• Orig date: Fri Apr 21 12:46:49 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/include/asm-arm/procinfo.h linux/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 __ASSEMBLY__
 
-#ifndef __ASSEMBLER__
+#include <asm/proc-fns.h>
 
-#define HWCAP_SWP	(1 << 0)
-#define HWCAP_HALF	(1 << 1)
+struct proc_info_item {
+	const char	 *manufacturer;
+	const char	 *cpu_name;
+};
 
-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	*/
+/*
+ * Note!  struct processor is always defined if we're
+ * using MULTI_CPU, otherwise this entry is unused,
+ * but still exists.  NOTE! This structure is used
+ * by assembler code!  Check:
+ *  arch/arm/mm/proc-*.S and arch/arm/kernel/head-armv.S
+ */
+struct proc_info_list {
+	unsigned int	 cpu_val;
+	unsigned int	 cpu_mask;
+	unsigned long	 __cpu_mmu_flags;	/* used by head-armv.S */
+	unsigned long	 __cpu_flush;		/* used by head-armv.S */
+	const char	 *arch_name;
+	const char	 *elf_name;
+	unsigned int	 elf_hwcap;
+	struct proc_info_item *info;
+	struct processor *proc;
 };
 
-extern const struct armversions armidlist[];
-extern int armidindex;
+#endif	/* __ASSEMBLY__ */
 
-#endif
+#define HWCAP_SWP	1
+#define HWCAP_HALF	2
+#define HWCAP_THUMB	4
+#define HWCAP_26BIT	8	/* Play it safe */
 
 #endif