diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-16 08:26:00 +0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-16 08:26:00 +0700 |
| commit | 9826dbb1e9bdea2aa909a152733c663a8c773754 (patch) | |
| tree | 60c932482f35a0426881cc15aa4e34795ce6602f /arch/arm/mach-highbank | |
| parent | 70b23ce347c025a06339abd995b1df4a9fe096ba (diff) | |
| parent | b25f3e1c358434bf850220e04f28eebfc45eb634 (diff) | |
| download | linux-9826dbb1e9bdea2aa909a152733c663a8c773754.tar.gz linux-9826dbb1e9bdea2aa909a152733c663a8c773754.tar.bz2 linux-9826dbb1e9bdea2aa909a152733c663a8c773754.zip | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Another few fixes for ARM, nothing major here"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 7938/1: OMAP4/highbank: Flush L2 cache before disabling
ARM: 7939/1: traps: fix opcode endianness when read from user memory
ARM: 7937/1: perf_event: Silence sparse warning
ARM: 7934/1: DT/kernel: fix arch_match_cpu_phys_id to avoid erroneous match
Revert "ARM: 7908/1: mm: Fix the arm_dma_limit calculation"
Diffstat (limited to 'arch/arm/mach-highbank')
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index bd3bf66ce344..c7de89b263dd 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -53,6 +53,7 @@ static void __init highbank_scu_map_io(void) static void highbank_l2x0_disable(void) { + outer_flush_all(); /* Disable PL310 L2 Cache controller */ highbank_smc1(0x102, 0x0); } |