diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2023-04-21 13:24:18 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2023-04-21 13:24:18 +0200 |
| commit | 5a4d3b38ed0cd5bbb03eccea6d9949136abc45c3 (patch) | |
| tree | 1e653da8837c52ed1d24126974a0d7dbbdf34e02 /mm/page_alloc.c | |
| parent | sched/core: Make sched_dynamic_mutex static (diff) | |
| parent | Linux 6.3-rc7 (diff) | |
| download | wireguard-linux-5a4d3b38ed0cd5bbb03eccea6d9949136abc45c3.tar.xz wireguard-linux-5a4d3b38ed0cd5bbb03eccea6d9949136abc45c3.zip | |
Merge branch 'v6.3-rc7'
Sync with the urgent patches; in particular:
a53ce18cacb4 ("sched/fair: Sanitize vruntime of entity being migrated")
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ac1fc986af44..7136c36c5d01 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1398,6 +1398,7 @@ static __always_inline bool free_pages_prepare(struct page *page, unsigned int order, bool check_free, fpi_t fpi_flags) { int bad = 0; + bool skip_kasan_poison = should_skip_kasan_poison(page, fpi_flags); bool init = want_init_on_free(); VM_BUG_ON_PAGE(PageTail(page), page); @@ -1470,7 +1471,7 @@ static __always_inline bool free_pages_prepare(struct page *page, * With hardware tag-based KASAN, memory tags must be set before the * page becomes unavailable via debug_pagealloc or arch_free_page. */ - if (!should_skip_kasan_poison(page, fpi_flags)) { + if (!skip_kasan_poison) { kasan_poison_pages(page, order, init); /* Memory is already initialized if KASAN did it internally. */ |