Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

torvalds · torvalds · commit f28535c100e3 · 2016-08-18T11:17:13.000-07:00
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
diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S
@@ -101,12 +101,20 @@ ENTRY(cpu_resume)
 	bl	el2_setup		// if in EL2 drop to EL1 cleanly
 	/* enable the MMU early - so we can access sleep_save_stash by va */
 	adr_l	lr, __enable_mmu	/* __cpu_setup will return here */
-	ldr	x27, =_cpu_resume	/* __enable_mmu will branch 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)
 
+	.pushsection	".idmap.text", "ax"
+_resume_switched:
+	ldr	x8, =_cpu_resume
+	br	x8
+ENDPROC(_resume_switched)
+	.ltorg
+	.popsection
+
 ENTRY(_cpu_resume)
 	mrs	x1, mpidr_el1
 	adrp	x8, mpidr_hash
diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c
@@ -242,7 +242,7 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level,
 
 static void walk_pte(struct pg_state *st, pmd_t *pmd, unsigned long start)
 {
-	pte_t *pte = pte_offset_kernel(pmd, 0);
+	pte_t *pte = pte_offset_kernel(pmd, 0UL);
 	unsigned long addr;
 	unsigned i;
 
@@ -254,7 +254,7 @@ static void walk_pte(struct pg_state *st, pmd_t *pmd, unsigned long start)
 
 static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start)
 {
-	pmd_t *pmd = pmd_offset(pud, 0);
+	pmd_t *pmd = pmd_offset(pud, 0UL);
 	unsigned long addr;
 	unsigned i;
 
@@ -271,7 +271,7 @@ static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start)
 
 static void walk_pud(struct pg_state *st, pgd_t *pgd, unsigned long start)
 {
-	pud_t *pud = pud_offset(pgd, 0);
+	pud_t *pud = pud_offset(pgd, 0UL);
 	unsigned long addr;
 	unsigned i;
 
diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c
@@ -23,6 +23,8 @@
 #include <linux/module.h>
 #include <linux/of.h>
 
+#include <asm/acpi.h>
+
 struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
 EXPORT_SYMBOL(node_data);
 nodemask_t numa_nodes_parsed __initdata;

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level,`
`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,7 +254,7 @@ static void walk_pte(struct pg_state st, pmd_t pmd, unsigned long start)`
`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,7 +271,7 @@ static void walk_pmd(struct pg_state st, pud_t pud, unsigned long start)`
`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`