diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-25 16:27:52 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-25 16:27:52 (GMT) |
commit | 24c82fbb86c675bc265d2bd815d17c4861c50580 (patch) | |
tree | 152eb2e427bc79af2075043e70bf087f21aefc78 /fs/gfs2/main.c | |
parent | 28165ec7a99be98123aa89540bf2cfc24df19498 (diff) | |
parent | 784c2213e79c094ffd9c1118722ac9ee5fce5e77 (diff) | |
download | linux-24c82fbb86c675bc265d2bd815d17c4861c50580.tar.xz |
Merge branch 'parisc-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
- Add native high-resolution timing code for sched_clock() and other
timing functions based on the processor internal cr16 cycle counters
- Add syscall tracepoint support
- Add regset support
- Speed up get_user() and put_user() functions
- Updated futex.h to match generic implementation (John David Anglin)
- A few smaller ftrace build fixes
- Fixed thuge-gen kernel self test to utilize architectured MAP_HUGETLB
value
- Added parisc architecture to seccomp_bpf kernel self test
- Various typo fixes (Andrea Gelmini)
* 'parisc-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Whitespace cleanups in unistd.h
parisc: Use long jump to reach ftrace_return_to_handler()
parisc: Fix typo in fpudispatch.c
parisc: Fix typos in eisa_eeprom.h
parisc: Fix typo in ldcw.h
parisc: Fix typo in pdc.h
parisc: Update futex.h to match generic implementation
parisc: Merge ftrace C-helper and assembler functions into .text.hot section
selftests/thuge-gen: Use platform specific MAP_HUGETLB value
parisc: Add native high-resolution sched_clock() implementation
parisc: Add ARCH_TRACEHOOK and regset support
parisc: Add 64bit get_user() and put_user() for 32bit kernel
parisc: Simplify and speed up get_user() and put_user()
parisc: Add syscall tracepoint support
Diffstat (limited to 'fs/gfs2/main.c')
0 files changed, 0 insertions, 0 deletions