diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 12:34:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 12:34:43 -0500 |
commit | 3eb5b893ebec7325ac9e6b8e4864af89a9ca1ed1 (patch) | |
tree | c1ced8c2c3eb68f14001fcca35d5b0eed8277a52 /include/asm-generic | |
parent | 9e66645d72d3c395da92b0f8855c787f4b5f0e89 (diff) | |
parent | 9f7789f845cc100dd0d94fa1aa083e3373dc03db (diff) |
Merge branch 'x86-mpx-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 MPX support from Thomas Gleixner:
"This enables support for x86 MPX.
MPX is a new debug feature for bound checking in user space. It
requires kernel support to handle the bound tables and decode the
bound violating instruction in the trap handler"
* 'x86-mpx-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
asm-generic: Remove asm-generic arch_bprm_mm_init()
mm: Make arch_unmap()/bprm_mm_init() available to all architectures
x86: Cleanly separate use of asm-generic/mm_hooks.h
x86 mpx: Change return type of get_reg_offset()
fs: Do not include mpx.h in exec.c
x86, mpx: Add documentation on Intel MPX
x86, mpx: Cleanup unused bound tables
x86, mpx: On-demand kernel allocation of bounds tables
x86, mpx: Decode MPX instruction to get bound violation information
x86, mpx: Add MPX-specific mmap interface
x86, mpx: Introduce VM_MPX to indicate that a VMA is MPX specific
x86, mpx: Add MPX to disabled features
ia64: Sync struct siginfo with general version
mips: Sync struct siginfo with general version
mpx: Extend siginfo structure to include bound violation information
x86, mpx: Rename cfg_reg_u and status_reg
x86: mpx: Give bndX registers actual names
x86: Remove arbitrary instruction size limit in instruction decoder
Diffstat (limited to 'include/asm-generic')
-rw-r--r-- | include/asm-generic/mm_hooks.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/asm-generic/mm_hooks.h b/include/asm-generic/mm_hooks.h index 67dea8123683..866aa461efa5 100644 --- a/include/asm-generic/mm_hooks.h +++ b/include/asm-generic/mm_hooks.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Define generic no-op hooks for arch_dup_mmap and arch_exit_mmap, to | 2 | * Define generic no-op hooks for arch_dup_mmap, arch_exit_mmap |
3 | * be included in asm-FOO/mmu_context.h for any arch FOO which doesn't | 3 | * and arch_unmap to be included in asm-FOO/mmu_context.h for any |
4 | * need to hook these. | 4 | * arch FOO which doesn't need to hook these. |
5 | */ | 5 | */ |
6 | #ifndef _ASM_GENERIC_MM_HOOKS_H | 6 | #ifndef _ASM_GENERIC_MM_HOOKS_H |
7 | #define _ASM_GENERIC_MM_HOOKS_H | 7 | #define _ASM_GENERIC_MM_HOOKS_H |
@@ -15,4 +15,15 @@ static inline void arch_exit_mmap(struct mm_struct *mm) | |||
15 | { | 15 | { |
16 | } | 16 | } |
17 | 17 | ||
18 | static inline void arch_unmap(struct mm_struct *mm, | ||
19 | struct vm_area_struct *vma, | ||
20 | unsigned long start, unsigned long end) | ||
21 | { | ||
22 | } | ||
23 | |||
24 | static inline void arch_bprm_mm_init(struct mm_struct *mm, | ||
25 | struct vm_area_struct *vma) | ||
26 | { | ||
27 | } | ||
28 | |||
18 | #endif /* _ASM_GENERIC_MM_HOOKS_H */ | 29 | #endif /* _ASM_GENERIC_MM_HOOKS_H */ |