linux519: Fix bcachefs patchset and silence a config prompt
This commit is contained in:
2
PKGBUILD
2
PKGBUILD
@@ -835,7 +835,7 @@ case $_basever in
|
||||
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
|
||||
'9df628fd530950e37d31da854cb314d536f33c83935adf5c47e71266a55f7004'
|
||||
'057631ecc148b41e0037d200a69cbbfbed8cdcf27eede3d8cd6936566b6ebc68'
|
||||
'ee9889e94dcb2cee098c39e76e27d714c6071c41a85f3d70361a9cf2c25e4cd3'
|
||||
'40e7ecc52af379df1e362b32e5b9827815284dae895328556336cb0d10979b63'
|
||||
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
|
||||
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
|
||||
'b9822a7f912a46196facb9e70229b90357fbc7c7c1dfe23a407e1cb014add30d'
|
||||
|
@@ -1177,7 +1177,7 @@ _tkg_srcprep() {
|
||||
_tkg_patcher
|
||||
|
||||
_enable "BCACHEFS_FS" "BCACHEFS_QUOTA" "BCACHEFS_POSIX_ACL"
|
||||
_disable "BCACHEFS_DEBUG" "BCACHEFS_TESTS" "DEBUG_CLOSURES"
|
||||
_disable "BCACHEFS_DEBUG" "BCACHEFS_TESTS" "DEBUG_CLOSURES" "BCACHEFS_LOCK_TIME_STATS"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user