Commit e39bccf2 authored Mar 31, 2017 by Linus Torvalds

linux

Pull arm64 fixes from Will Deacon:
 "The main thing is a fix for a NULL dereference on systems that boot
  using spin-tables or the ACPI parking protocol, but there are also a
  couple of trivial one-liners too.

  We're currently debugging a page flags corruption issue under
  syzkaller, but we're still some way from fixing that as it's proving
  fiddly to reproduce.

  Summary:

   - fix cpu_die() NULL dereference when booting secondary CPUs using
     spin-table

   - remove redundant #include

   - remove obsolete .gitignore entry"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: drop non-existing vdso-offsets.h from .gitignore
  arm64: remove redundant header file in current.h
  arm64: fix NULL dereference in have_cpu_die()

parents 035f0cd3 9b3403ae

arch/arm64/include/asm/current.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -3,8 +3,6 @@

		#include <linux/compiler.h>

		#include <asm/sysreg.h>

		#ifndef __ASSEMBLY__

		struct task_struct;

arch/arm64/kernel/smp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -944,7 +944,7 @@ static bool have_cpu_die(void)
		#ifdef CONFIG_HOTPLUG_CPU
		int any_cpu = raw_smp_processor_id();

		if (cpu_ops[any_cpu]->cpu_die)
		if (cpu_ops[any_cpu] && cpu_ops[any_cpu]->cpu_die)
		return true;
		#endif
		return false;

arch/arm64/kernel/vdso/.gitignore

+0 −1

Original line number	Diff line number	Diff line
		vdso.lds
		vdso-offsets.h

Admin message