Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36c0a48f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm64 fixes from Will Deacon:
 "Given that my availability next week is likely to be poor, here are
  three arm64 fixes to resolve some issues introduced by features merged
  last week.  I was going to wait until -rc1, but it doesn't make much
  sense to sit on fixes.

  Fix some fallout introduced during the merge window:

   - Build failure when PM_SLEEP is disabled but CPU_IDLE is enabled
   - Compiler warning from page table dumper w/ 48-bit VAs
   - Erroneous page table truncation in reported dump"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: mm: dump: don't skip final region
  arm64: mm: dump: fix shift warning
  arm64: psci: Fix build breakage without PM_SLEEP
parents a643fc72 fb59d007

arch/arm64/kernel/psci.c

+2 −0
Original line number Diff line number Diff line
@@ -540,6 +540,8 @@ const struct cpu_operations cpu_psci_ops = { 
	.name		= "psci",

#ifdef CONFIG_CPU_IDLE

	.cpu_init_idle	= cpu_psci_cpu_init_idle,

#endif

#ifdef CONFIG_ARM64_CPU_SUSPEND

	.cpu_suspend	= cpu_psci_cpu_suspend,

#endif

#ifdef CONFIG_SMP

arch/arm64/mm/dump.c

+1 −4
Original line number Diff line number Diff line
@@ -182,9 +182,6 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level, 
	static const char units[] = "KMGTPE";

	u64 prot = val & pg_level[level].mask;



	if (addr < LOWEST_ADDR)

		return;



	if (!st->level) {

		st->level = level;

		st->current_prot = prot;
@@ -272,7 +269,7 @@ static void walk_pud(struct pg_state *st, pgd_t *pgd, unsigned long start) 


static void walk_pgd(struct pg_state *st, struct mm_struct *mm, unsigned long start)

{

	pgd_t *pgd = pgd_offset(mm, 0);

	pgd_t *pgd = pgd_offset(mm, 0UL);

	unsigned i;

	unsigned long addr;