sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux519: Fix bcachefs patchset and silence a config prompt

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD
View File

@@ -835,7 +835,7 @@ case $_basever in
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'9df628fd530950e37d31da854cb314d536f33c83935adf5c47e71266a55f7004' '9df628fd530950e37d31da854cb314d536f33c83935adf5c47e71266a55f7004'
'057631ecc148b41e0037d200a69cbbfbed8cdcf27eede3d8cd6936566b6ebc68' '057631ecc148b41e0037d200a69cbbfbed8cdcf27eede3d8cd6936566b6ebc68'
'ee9889e94dcb2cee098c39e76e27d714c6071c41a85f3d70361a9cf2c25e4cd3' '40e7ecc52af379df1e362b32e5b9827815284dae895328556336cb0d10979b63'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
'b9822a7f912a46196facb9e70229b90357fbc7c7c1dfe23a407e1cb014add30d' 'b9822a7f912a46196facb9e70229b90357fbc7c7c1dfe23a407e1cb014add30d'

2
linux-tkg-config/prepare
View File

@@ -1177,7 +1177,7 @@ _tkg_srcprep() {
_tkg_patcher _tkg_patcher
_enable "BCACHEFS_FS" "BCACHEFS_QUOTA" "BCACHEFS_POSIX_ACL" _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
fi fi

14
linux-tkg-patches/5.19/0008-5.19-bcachefs.patch
View File

@@ -90895,7 +90895,7 @@ index 618c366a2f07..660ddd48267d 100644
/* /*
* Provide statistics on the state of the memory subsystem as * Provide statistics on the state of the memory subsystem as
* well as cumulative event counters that show past behavior. * 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; u64 size;
size = memcg_page_state_output(memcg, memory_stats[i].idx); size = memcg_page_state_output(memcg, memory_stats[i].idx);
@@ -90954,7 +90954,17 @@ index 618c366a2f07..660ddd48267d 100644
+ memcg_events(memcg, PGLAZYFREED)); + memcg_events(memcg, PGLAZYFREED));
#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) #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) @@ -1525,16 +1521,18 @@ static char *memory_stat_format(struct mem_cgroup *memcg)
#endif #endif