diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2018-04-09 10:08:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-04-09 10:08:51 +0100 |
| commit | 9178caf9649d97e976adbfca1f56477befde28f8 (patch) | |
| tree | 23499ef52864a885e52431839b9a4b6835deb16b /arch/arm/mm | |
| parent | b54290e51accea4f696f5dacef8e609d0ccbe54a (diff) | |
| parent | 5f8d561fb019a3ebe073c019bf5f797f5b06c55e (diff) | |
| download | linux-9178caf9649d97e976adbfca1f56477befde28f8.tar.gz linux-9178caf9649d97e976adbfca1f56477befde28f8.tar.bz2 linux-9178caf9649d97e976adbfca1f56477befde28f8.zip | |
Merge branches 'devel-stable' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/mm')
| -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 d55d493f9a1e..b528a15f460d 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -272,6 +272,7 @@ ENDPROC(cpu_pj4b_do_resume) __v7_ca5mp_setup: __v7_ca9mp_setup: __v7_cr7mp_setup: +__v7_cr8mp_setup: mov r10, #(1 << 0) @ Cache/TLB ops broadcasting b 1f __v7_ca7mp_setup: @@ -642,6 +643,16 @@ __v7_cr7mp_proc_info: .size __v7_cr7mp_proc_info, . - __v7_cr7mp_proc_info /* + * ARM Ltd. Cortex R8 processor. + */ + .type __v7_cr8mp_proc_info, #object +__v7_cr8mp_proc_info: + .long 0x410fc180 + .long 0xff0ffff0 + __v7_proc __v7_cr8mp_proc_info, __v7_cr8mp_setup + .size __v7_cr8mp_proc_info, . - __v7_cr8mp_proc_info + + /* * ARM Ltd. Cortex A7 processor. */ .type __v7_ca7mp_proc_info, #object |