Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Browse source

Pull ARM fixes from Russell King:
 "Two fixes this time, one to ensure that the kuser helper option
  depends on MMU as they aren't available for noMMU targets (and if the
  option is selected, we end up oopsing.)

  The second fix plugs a corner case with the decompressor, ensuring
  that the instruction stream can see the relocated code in every case
  on ARMv7 CPUs"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8198/1: make kuser helpers depend on MMU
  ARM: 8191/1: decompressor: ensure I-side picks up relocated code

...

This commit is contained in:

Linus Torvalds 2014-11-15 15:45:07 -08:00

parent 555e5986ba 08b964ff3c

commit 5f01feb8b9

2 changed files with 17 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

arch/arm/boot/compressed/head.S

View file

1

arch/arm/mm/Kconfig

View file