diff options
| author | Andrew Morton | 2023-06-23 16:58:19 -0700 |
|---|---|---|
| committer | Andrew Morton | 2023-06-23 16:58:19 -0700 |
| commit | 63773d2b593d86440c3b96fd300ed80d00cd06ef (patch) | |
| tree | ebc7b1e8f1c0ce535ef9c6120209d0e87d8d4b16 /mm/khugepaged.c | |
| parent | cf01724e2d73a90524450e3dd8798cfb9d7aca05 (diff) | |
| parent | 814bc1de03ea4361101408e63a68e4b82aef22cb (diff) | |
Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.
Diffstat (limited to 'mm/khugepaged.c')
| -rw-r--r-- | mm/khugepaged.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 87e962c79a52..5ef1e08b2a06 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2089,7 +2089,6 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, TTU_IGNORE_MLOCK | TTU_BATCH_FLUSH); xas_lock_irq(&xas); - xas_set(&xas, index); VM_BUG_ON_PAGE(page != xas_load(&xas), page); |