git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
include
/
asm-arm
/
procinfo.h
diff --git
a/include/asm-arm/procinfo.h
b/include/asm-arm/procinfo.h
index
8425260
..
91a31ad
100644
(file)
--- a/
include/asm-arm/procinfo.h
+++ b/
include/asm-arm/procinfo.h
@@
-29,7
+29,8
@@
struct processor;
struct proc_info_list {
unsigned int cpu_val;
unsigned int cpu_mask;
struct proc_info_list {
unsigned int cpu_val;
unsigned int cpu_mask;
- unsigned long __cpu_mmu_flags; /* used by head.S */
+ unsigned long __cpu_mm_mmu_flags; /* used by head.S */
+ unsigned long __cpu_io_mmu_flags; /* used by head.S */
unsigned long __cpu_flush; /* used by head.S */
const char *arch_name;
const char *elf_name;
unsigned long __cpu_flush; /* used by head.S */
const char *arch_name;
const char *elf_name;
@@
-54,5
+55,6
@@
extern unsigned int elf_hwcap;
#define HWCAP_VFP 64
#define HWCAP_EDSP 128
#define HWCAP_JAVA 256
#define HWCAP_VFP 64
#define HWCAP_EDSP 128
#define HWCAP_JAVA 256
+#define HWCAP_IWMMXT 512
#endif
#endif