Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- Avoid a literal load with the MMU off on the CPU resume path
(potential inconsistency between cache and RAM)
- Build error with CONFIG_ACPI=n fixed
- Compiler warning in the arch/arm64/mm/dump.c code fixed
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: Fix shift warning in arch/arm64/mm/dump.c
arm64: kernel: avoid literal load of virtual address with MMU off
arm64: Fix NUMA build error when !CONFIG_ACPI
+14
-4
+9
-1
arch/arm64/kernel/sleep.S
+9
-1
arch/arm64/kernel/sleep.S
···
101
101
bl el2_setup // if in EL2 drop to EL1 cleanly
102
102
/* enable the MMU early - so we can access sleep_save_stash by va */
103
103
adr_l lr, __enable_mmu /* __cpu_setup will return here */
104
-
ldr x27, =_cpu_resume /* __enable_mmu will branch here */
104
+
adr_l x27, _resume_switched /* __enable_mmu will branch here */
105
105
adrp x25, idmap_pg_dir
106
106
adrp x26, swapper_pg_dir
107
107
b __cpu_setup
108
108
ENDPROC(cpu_resume)
109
+
110
+
.pushsection ".idmap.text", "ax"
111
+
_resume_switched:
112
+
ldr x8, =_cpu_resume
113
+
br x8
114
+
ENDPROC(_resume_switched)
115
+
.ltorg
116
+
.popsection
109
117
110
118
ENTRY(_cpu_resume)
111
119
mrs x1, mpidr_el1
+3
-3
arch/arm64/mm/dump.c
+3
-3
arch/arm64/mm/dump.c
···
242
242
243
243
static void walk_pte(struct pg_state *st, pmd_t *pmd, unsigned long start)
244
244
{
245
-
pte_t *pte = pte_offset_kernel(pmd, 0);
245
+
pte_t *pte = pte_offset_kernel(pmd, 0UL);
246
246
unsigned long addr;
247
247
unsigned i;
248
248
···
254
254
255
255
static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start)
256
256
{
257
-
pmd_t *pmd = pmd_offset(pud, 0);
257
+
pmd_t *pmd = pmd_offset(pud, 0UL);
258
258
unsigned long addr;
259
259
unsigned i;
260
260
···
271
271
272
272
static void walk_pud(struct pg_state *st, pgd_t *pgd, unsigned long start)
273
273
{
274
-
pud_t *pud = pud_offset(pgd, 0);
274
+
pud_t *pud = pud_offset(pgd, 0UL);
275
275
unsigned long addr;
276
276
unsigned i;
277
277