[PATCH] mtd: mtdoops: Fix kmsgdump parameter renaming.

Jocelyn Falempe jfalempe at redhat.com
Mon Jul 22 16:33:46 UTC 2024



On 22/07/2024 17:21, Richard Weinberger wrote:
> ----- Ursprüngliche Mail -----
>> Betreff: [PATCH] mtd: mtdoops: Fix kmsgdump parameter renaming.
> 
>> When the kmsg_dumper callback parameter changed, the reason variable
>> in mtdoops_do_dump() was not updated accordingly.
>> This breaks the build with mtdoops.
>>
>> Fixes: e1a261ba599e ("printk: Add a short description string to kmsg_dump()")
>> Reported-by: Knop Ryszard <ryszard.knop at intel.com>
>> Signed-off-by: Jocelyn Falempe <jfalempe at redhat.com>
>> ---
>>
>> The offended commit is in the drm-misc tree, because it was needed
>> by drm_panic. So I will push the fix there too.
>>
>> drivers/mtd/mtdoops.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
>> index 86d49db9196d..7bf3777e1f13 100644
>> --- a/drivers/mtd/mtdoops.c
>> +++ b/drivers/mtd/mtdoops.c
>> @@ -305,7 +305,7 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper,
>> 	struct kmsg_dump_iter iter;
>>
>> 	/* Only dump oopses if dump_oops is set */
>> -	if (reason == KMSG_DUMP_OOPS && !dump_oops)
>> +	if (detail->reason == KMSG_DUMP_OOPS && !dump_oops)
>> 		return;
>>
>> 	kmsg_dump_rewind(&iter);
>> @@ -317,7 +317,7 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper,
>> 			     record_size - sizeof(struct mtdoops_hdr), NULL);
>> 	clear_bit(0, &cxt->oops_buf_busy);
>>
>> -	if (reason != KMSG_DUMP_OOPS) {
>> +	if (detail->reason != KMSG_DUMP_OOPS) {
> 
> Acked-by: Richard Weinberger <richard at nod.at>

I pushed it to drm-misc-next.

Thanks a lot.

> 
> Thanks,
> //richard
> 



More information about the dri-devel mailing list