From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Apr 2014 20:21:35 +0000 (-0700)
Subject: Merge branch 'parisc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: firefly_0821_release~176^2~4037
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=81cef0fe19e086ff6abfd45e92246f68ffa0185f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'parisc-3.15' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc updates from Helge Deller:
 "There are two major changes in this patchset:

  The major fix is that the epoll_pwait() syscall for 32bit userspace
  was not using the compat wrapper on a 64bit kernel.

  Secondly we changed the value of SHMLBA from 4MB to PAGE_SIZE to
  reflect that we can actually mmap to any multiple of PAGE_SIZE.  The
  only thing which needs care is that shared mmaps need to be mapped at
  the same offset inside the 4MB cache window"

* 'parisc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: fix epoll_pwait syscall on compat kernel
  parisc: change value of SHMLBA from 0x00400000 to PAGE_SIZE
  parisc: Replace __get_cpu_var uses for address calculation
---

81cef0fe19e086ff6abfd45e92246f68ffa0185f