diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-07-12 08:36:42 +0200 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-07-13 00:52:08 +0200 |
| commit | 998d4e2c33be49297c780e0e59a333918b7c97e4 (patch) | |
| tree | 502d14d829e47c1cb9d883baa57dcbebbbe176a0 /mm/zsmalloc.c | |
| parent | mm: zswap: fix zswap_never_enabled() for CONFIG_ZSWAP==N (diff) | |
| download | linux-998d4e2c33be49297c780e0e59a333918b7c97e4.tar.xz linux-998d4e2c33be49297c780e0e59a333918b7c97e4.zip | |
mm/hugetlb.c: undo errant change
During conflict resolution a line was unintentionally removed by a ksm.c
patch.
Link: https://lkml.kernel.org/r/85b0d694-d1ac-8e7a-2e50-1edc03eee21a@google.com
Fixes: ac90c56bbd73 ("mm/ksm: refactor out try_to_merge_with_zero_page()")
Reported-by: Hugh Dickins <hughd@google.com>
Cc: Aristeu Rozanski <aris@redhat.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm/zsmalloc.c')
0 files changed, 0 insertions, 0 deletions