diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-03 11:37:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-03 11:37:50 -0700 |
| commit | 9b0d551bcc05fa4786689544a2845024db1d41b6 (patch) | |
| tree | 4bcf4d24ec6ff80864a2aff9e8ac78bd1e75439a /arch/csky/mm/fault.c | |
| parent | 33fc69a05c50f00f1218408a56348bcab95b831d (diff) | |
| parent | f037fd7fbca4d111955b5889417ddf6fb24498e5 (diff) | |
Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc non-vfs updates from Al Viro:
"Assorted dead code removal around asm/pgtable.h"
* tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
alpha: unobfuscate _PAGE_P() definition
kill FIRST_USER_PGD_NR
alpha: get rid of the remnants of BAD_PAGE and friends
SET_PAGE_DIR() users had been gone since 2.3.12pre1
PAGE_PTR() had been last used outside of arch/* in 1.1.94
csky: remove BS check for FAULT_FLAG_ALLOW_RETRY
Diffstat (limited to 'arch/csky/mm/fault.c')
| -rw-r--r-- | arch/csky/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c index a885518ce1dd..a6ca7dff4215 100644 --- a/arch/csky/mm/fault.c +++ b/arch/csky/mm/fault.c @@ -277,7 +277,7 @@ retry: if (fault & VM_FAULT_COMPLETED) return; - if (unlikely((fault & VM_FAULT_RETRY) && (flags & FAULT_FLAG_ALLOW_RETRY))) { + if (unlikely(fault & VM_FAULT_RETRY)) { flags |= FAULT_FLAG_TRIED; /* |