tree addb100702a26c35a7a0bb8da64a5b247ef26d4a
parent d2149e13e5fba83752b7050edfaefcf954a18c00
parent 18a955219bf7d9008ce480d4451b6b8bf4483a22
author Linus Torvalds <torvalds@linux-foundation.org> 1521399674 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1521399674 -0700

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fix from Thomas Gleixner:
 "A single fix for vmalloc_fault() which uses p*d_huge() unconditionally
  whether CONFIG_HUGETLBFS is set or not. In case of CONFIG_HUGETLBFS=n
  this results in a crash as p*d_huge() returns 0 in that case"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Fix vmalloc_fault to use pXd_large