diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:16 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:16 +0000 |
| commit | a32737e1ca650504f172292dd344eb64c02311f3 (patch) | |
| tree | 7dd2004ece26081507af877d9dd40b1bd4eecc1a /arch/arm/mm/proc-v7.S | |
| parent | 27edacac7d97d37ec77779c7da08345298a5d283 (diff) | |
| parent | a3c2b511a844641f6d0b60bd84cd6076143b3f2d (diff) | |
| download | op-kernel-dev-a32737e1ca650504f172292dd344eb64c02311f3.zip op-kernel-dev-a32737e1ca650504f172292dd344eb64c02311f3.tar.gz | |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/mm/proc-v7.S')
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index e70a737..69a98a4 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -284,6 +284,7 @@ __v7_ca5mp_setup: __v7_ca9mp_setup: mov r10, #(1 << 0) @ TLB ops broadcasting b 1f +__v7_ca7mp_setup: __v7_ca15mp_setup: mov r10, #0 1: @@ -465,6 +466,16 @@ __v7_ca5mp_proc_info: .size __v7_ca5mp_proc_info, . - __v7_ca5mp_proc_info /* + * ARM Ltd. Cortex A7 processor. + */ + .type __v7_ca7mp_proc_info, #object +__v7_ca7mp_proc_info: + .long 0x410fc070 + .long 0xff0ffff0 + __v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV + .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info + + /* * ARM Ltd. Cortex A9 processor. */ .type __v7_ca9mp_proc_info, #object |
