diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2025-03-25 08:17:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-25 08:17:25 +0100 |
| commit | 2487b6b9bf2874cfca7efb59c95650c5b1d88d43 (patch) | |
| tree | 8bd7a32686e006b1cbeeb80511114c63ac442c87 /mm/memory.c | |
| parent | x86/speculation: Remove the extra #ifdef around CALL_NOSPEC (diff) | |
| parent | x86 boot build: make git ignore stale 'tools' directory (diff) | |
| download | wireguard-linux-2487b6b9bf2874cfca7efb59c95650c5b1d88d43.tar.xz wireguard-linux-2487b6b9bf2874cfca7efb59c95650c5b1d88d43.zip | |
Merge branch 'linus' into x86/urgent, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index fb7b8dc75167..4f6d9766a046 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -6834,10 +6834,8 @@ void __might_fault(const char *file, int line) if (pagefault_disabled()) return; __might_sleep(file, line); -#if defined(CONFIG_DEBUG_ATOMIC_SLEEP) if (current->mm) might_lock_read(¤t->mm->mmap_lock); -#endif } EXPORT_SYMBOL(__might_fault); #endif |