From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Oct 2013 17:45:00 +0000 (-0700)
Subject: Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: Ubuntu-5.2.0-15.16~14672
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a2ff82065b5b2807e699995671dc282be20ce8fd;p=mirror_ubuntu-eoan-kernel.git

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
---

a2ff82065b5b2807e699995671dc282be20ce8fd