Skip to content

Commit 5da58ae

Browse files
committed
Revert "arm64, mm: avoid always making PTE dirty in pte_mkwrite()"
deepin inclusion category: bugfix This reverts commit 4dfc170. which 4f32f754343a8888c9b2196633491d7b2665c8c4 stable, which 143937c upstream. It broken s4 and kexec, before solution upstreamed, revert it. Link: https://lore.kernel.org/all/20251204062722.3367201-1-jianpeng.chang.cn@windriver.com/ Signed-off-by: wenlunpeng <wenlunpeng@uniontech.com> Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent b4c7ae4 commit 5da58ae

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

arch/arm64/include/asm/pgtable.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@ static inline pmd_t set_pmd_bit(pmd_t pmd, pgprot_t prot)
184184
static inline pte_t pte_mkwrite_novma(pte_t pte)
185185
{
186186
pte = set_pte_bit(pte, __pgprot(PTE_WRITE));
187-
if (pte_sw_dirty(pte))
188-
pte = clear_pte_bit(pte, __pgprot(PTE_RDONLY));
187+
pte = clear_pte_bit(pte, __pgprot(PTE_RDONLY));
189188
return pte;
190189
}
191190

0 commit comments

Comments
 (0)