diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-03-15 09:17:54 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-03-15 09:17:54 -0300 |
commit | 689bb69093d7ac9e12ab058ba2611ad5eb9347c3 (patch) | |
tree | abb9131ea54d7c9df78e192b31a0c09635f8acab /fs/proc/task_mmu.c | |
parent | 2a76f6de07906f0bb5f2a13fb02845db1695cc29 (diff) | |
parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) |
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To update kernel headers and check if some need syncing.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'fs/proc/task_mmu.c')
-rw-r--r-- | fs/proc/task_mmu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 3cec6fbef725..e862cab69583 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1036,8 +1036,6 @@ struct clear_refs_private { #ifdef CONFIG_MEM_SOFT_DIRTY -#define is_cow_mapping(flags) (((flags) & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE) - static inline bool pte_is_pinned(struct vm_area_struct *vma, unsigned long addr, pte_t pte) { struct page *page; |