diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-08-16 21:02:32 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-08-22 14:25:15 +0100 |
| commit | aea73abb90265110ed59281e370289316fd689f3 (patch) | |
| tree | 1c448df9db20a482788188ee6355a3ca7dee6ecd /arch/arm64/kernel/sleep.S | |
| parent | 5a9e3e156ec1ab26ba70b4c44157858c92bbeee0 (diff) | |
| download | linux-stable-aea73abb90265110ed59281e370289316fd689f3.tar.gz linux-stable-aea73abb90265110ed59281e370289316fd689f3.tar.bz2 linux-stable-aea73abb90265110ed59281e370289316fd689f3.zip | |
arm64: head.S: get rid of x25 and x26 with 'global' scope
Currently, x25 and x26 hold the physical addresses of idmap_pg_dir
and swapper_pg_dir, respectively, when running early boot code. But
having registers with 'global' scope in files that contain different
sections with different lifetimes, and that are called by different
CPUs at different times is a bit messy, especially since stashing the
values does not buy us anything in terms of code size or clarity.
So simply replace each reference to x25 or x26 with an adrp instruction
referring to idmap_pg_dir or swapper_pg_dir directly.
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/sleep.S')
| -rw-r--r-- | arch/arm64/kernel/sleep.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S index ccf79d849e0a..182129b60fdf 100644 --- a/arch/arm64/kernel/sleep.S +++ b/arch/arm64/kernel/sleep.S @@ -102,8 +102,6 @@ ENTRY(cpu_resume) /* enable the MMU early - so we can access sleep_save_stash by va */ adr_l lr, __enable_mmu /* __cpu_setup will return here */ adr_l x27, _resume_switched /* __enable_mmu will branch here */ - adrp x25, idmap_pg_dir - adrp x26, swapper_pg_dir b __cpu_setup ENDPROC(cpu_resume) |