ARM: proc-arm94*.S: fix setup function

Browse source

Both ARM946 and ARM940 setup functions were corrupting r1 and r2,
which is not permissible - these are used to carry the machine ID
and boot data into the kernel, and must be preserved.

The code responsible for this was the same in both files: they were
using the registers to generate a protection region register value.

Fix this by turning this process into a macro, and using that macro
in both these files with an alternative register allocation.  r0,
r3 and r7 can be used for temporary values here.

Reported-by: Alex Dumitrache <broscutamaker@gmail.com>
Tested-by: Georg Hofstetter <g3gg0.de@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

...

This commit is contained in:

Russell King 2015-04-04 23:22:07 +01:00

parent f6ac49ba29

commit 6c5c2a01fc

3 changed files with 38 additions and 34 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

26

arch/arm/mm/proc-arm940.S

View file

22

arch/arm/mm/proc-arm946.S

View file

24

arch/arm/mm/proc-macros.S

View file