patch-2.4.22 linux-2.4.22/include/asm-arm/procinfo.h
Next file: linux-2.4.22/include/asm-arm/ptrace.h
Previous file: linux-2.4.22/include/asm-arm/processor.h
Back to the patch index
Back to the overall index
- Lines: 71
- Date:
2003-08-25 04:44:43.000000000 -0700
- Orig file:
linux-2.4.21/include/asm-arm/procinfo.h
- Orig date:
2001-04-12 12:20:31.000000000 -0700
diff -urN linux-2.4.21/include/asm-arm/procinfo.h linux-2.4.22/include/asm-arm/procinfo.h
@@ -1,7 +1,7 @@
/*
* linux/include/asm-arm/procinfo.h
*
- * Copyright (C) 1996-1999 Russell King
+ * Copyright (C) 1996-2002 Russell King
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -14,6 +14,8 @@
#include <asm/proc-fns.h>
+struct processor;
+
struct proc_info_item {
const char *manufacturer;
const char *cpu_name;
@@ -29,30 +31,31 @@
* 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;
-#ifdef MULTI_CPU
- struct processor *proc;
-#else
- void *unused;
-#endif
+ 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 unsigned int elf_hwcap;
+
#endif /* __ASSEMBLY__ */
-#define HWCAP_SWP 1
-#define HWCAP_HALF 2
-#define HWCAP_THUMB 4
-#define HWCAP_26BIT 8 /* Play it safe */
-#define HWCAP_FAST_MULT 16
-#define HWCAP_FPA 32
-#define HWCAP_VFP 64
-#define HWCAP_EDSP 128
+#define PROC_INFO_SZ 36
+
+#define HWCAP_SWP 1
+#define HWCAP_HALF 2
+#define HWCAP_THUMB 4
+#define HWCAP_26BIT 8 /* Play it safe */
+#define HWCAP_FAST_MULT 16
+#define HWCAP_FPA 32
+#define HWCAP_VFP 64
+#define HWCAP_EDSP 128
+#define HWCAP_JAVA 256
#endif
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)