linux519: Fix bcachefs patchset and silence a config prompt

This commit is contained in:
Tk-Glitch
2022-07-24 17:04:41 +02:00
parent 0b7d3b9bd8
commit 26cc3cf55b
3 changed files with 14 additions and 4 deletions

View File

@@ -90895,7 +90895,7 @@ index 618c366a2f07..660ddd48267d 100644
/*
* Provide statistics on the state of the memory subsystem as
* well as cumulative event counters that show past behavior.
@@ -1485,37 +1481,37 @@ static char *memory_stat_format(struct mem_cgroup *memcg)
@@ -1485,43 +1481,43 @@ static char *memory_stat_format(struct mem_cgroup *memcg)
u64 size;
size = memcg_page_state_output(memcg, memory_stats[i].idx);
@@ -90954,7 +90954,17 @@ index 618c366a2f07..660ddd48267d 100644
+ memcg_events(memcg, PGLAZYFREED));
#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP)
seq_buf_printf(&s, "%s %lu\n", vm_event_name(ZSWPIN),
- seq_buf_printf(&s, "%s %lu\n", vm_event_name(ZSWPIN),
- memcg_events(memcg, ZSWPIN));
- seq_buf_printf(&s, "%s %lu\n", vm_event_name(ZSWPOUT),
- memcg_events(memcg, ZSWPOUT));
+ prt_printf(&buf, "%s %lu\n", vm_event_name(ZSWPIN),
+ memcg_events(memcg, ZSWPIN));
+ prt_printf(&buf, "%s %lu\n", vm_event_name(ZSWPOUT),
+ memcg_events(memcg, ZSWPOUT));
#endif
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
@@ -1525,16 +1521,18 @@ static char *memory_stat_format(struct mem_cgroup *memcg)
#endif