diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-26 20:43:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-26 20:43:10 -0500 |
| commit | 33057692c2b4c1420ab6695a7feef5b6fda3a747 (patch) | |
| tree | 68bf634041b6aae0f1c93ada81e04679a82f1de2 /arch/arm/mm | |
| parent | 87726c334bf11188260a3af90a6ccbfe907498cb (diff) | |
| parent | 5010192d5ae589002c4453d6c6e662e5e9acae59 (diff) | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"Not much here, just a couple minor/cosmetic fixes and a patch for the
decompressor which fixes problems with modern GCC and CPUs."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7583/1: decompressor: Enable unaligned memory access for v6 and above
ARM: 7572/1: proc-v6.S: fix comment
ARM: 7570/1: quiet down the non make -s output
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 86b8b480634f..09c5233f4dfc 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
| @@ -89,7 +89,7 @@ ENTRY(cpu_v6_dcache_clean_area) | |||
| 89 | mov pc, lr | 89 | mov pc, lr |
| 90 | 90 | ||
| 91 | /* | 91 | /* |
| 92 | * cpu_arm926_switch_mm(pgd_phys, tsk) | 92 | * cpu_v6_switch_mm(pgd_phys, tsk) |
| 93 | * | 93 | * |
| 94 | * Set the translation table base pointer to be pgd_phys | 94 | * Set the translation table base pointer to be pgd_phys |
| 95 | * | 95 | * |