tree bfd97581db57d9fddb96ed3be9288f7e826b717e
parent aff22d3f1a8abef4d28817e0d762b3054e39cf7a
parent 54e181e073fc1415e41917d725ebdbd7de956455
author Linus Torvalds <torvalds@linux-foundation.org> 1382895900 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1382895900 -0700

Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc fix from Helge Deller:
 "This is a 2-line patch to save the CPU register which holds our task
  thread info pointer before calling a firmware function and then to
  restore it again afterwards.

  This is necessary because on some 64bit machines the high-order 32bits
  are being clobbered by the firmware call, and thus we failed to bring
  up secondary CPUs (and instead crashed the kernel) in some situations
  eg if we had more than 4GB RAM.  This patch fixes a bug which has been
  since ever in the parisc linux kernel and which prevented some people
  to use a 64bit kernel"

* 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Do not crash 64bit SMP kernels on machines with >= 4GB RAM