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
Showing
- arch/parisc/include/asm/shmparam.h 2 additions, 3 deletionsarch/parisc/include/asm/shmparam.h
- arch/parisc/kernel/cache.c 2 additions, 1 deletionarch/parisc/kernel/cache.c
- arch/parisc/kernel/sys_parisc.c 7 additions, 7 deletionsarch/parisc/kernel/sys_parisc.c
- arch/parisc/kernel/syscall_table.S 1 addition, 1 deletionarch/parisc/kernel/syscall_table.S
- arch/parisc/lib/memcpy.c 1 addition, 1 deletionarch/parisc/lib/memcpy.c
- arch/parisc/mm/fault.c 1 addition, 1 deletionarch/parisc/mm/fault.c
Loading
Please register or sign in to comment