| .. | .. |
|---|
| 45 | 45 | #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS |
|---|
| 46 | 46 | /* |
|---|
| 47 | 47 | * One bit per protection key says whether userspace can |
|---|
| 48 | | - * use it or not. protected by mmap_sem. |
|---|
| 48 | + * use it or not. protected by mmap_lock. |
|---|
| 49 | 49 | */ |
|---|
| 50 | 50 | u16 pkey_allocation_map; |
|---|
| 51 | 51 | s16 execute_only_pkey; |
|---|
| 52 | | -#endif |
|---|
| 53 | | -#ifdef CONFIG_X86_INTEL_MPX |
|---|
| 54 | | - /* address of the bounds directory */ |
|---|
| 55 | | - void __user *bd_addr; |
|---|
| 56 | 52 | #endif |
|---|
| 57 | 53 | } mm_context_t; |
|---|
| 58 | 54 | |
|---|
| 59 | 55 | #define INIT_MM_CONTEXT(mm) \ |
|---|
| 60 | 56 | .context = { \ |
|---|
| 61 | 57 | .ctx_id = 1, \ |
|---|
| 58 | + .lock = __MUTEX_INITIALIZER(mm.context.lock), \ |
|---|
| 62 | 59 | } |
|---|
| 63 | 60 | |
|---|
| 64 | 61 | void leave_mm(int cpu); |
|---|
| 62 | +#define leave_mm leave_mm |
|---|
| 65 | 63 | |
|---|
| 66 | 64 | #endif /* _ASM_X86_MMU_H */ |
|---|