package/kernel: add another round of missing bits from [21137] & [21138] (oops again)