aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-17 13:21:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-17 13:21:35 -0700
commit81cef0fe19e086ff6abfd45e92246f68ffa0185f (patch)
tree292b8f9a7697bde640fb2f167b1f37c1a12efc77 /arch/ia64
parentc2896def9750fdb84604bbcf917dee1e7b0c20a3 (diff)
parentab3e55b119c9653b19ea4edffb86f04db867ac98 (diff)
downloadlinux-linaro-stable-81cef0fe19e086ff6abfd45e92246f68ffa0185f.tar.gz
Merge branch 'parisc-3.15' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/ia64')
0 files changed, 0 insertions, 0 deletions