* [PATCH] mtd: mtdoops: Fix kmsgdump parameter renaming.
@ 2024-07-19 15:24 Jocelyn Falempe
2024-07-22 15:21 ` Richard Weinberger
0 siblings, 1 reply; 3+ messages in thread
From: Jocelyn Falempe @ 2024-07-19 15:24 UTC (permalink / raw)
To: Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
linux-mtd, linux-kernel, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Daniel Vetter, dri-devel
Cc: Jocelyn Falempe, Knop Ryszard
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@intel.com>
Signed-off-by: Jocelyn Falempe <jfalempe@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) {
/* Panics must be written immediately */
mtdoops_write(cxt, 1);
} else {
base-commit: 26dbffb2a4c4d4639c7b336f6b74a437c23dadd4
--
2.45.2
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] mtd: mtdoops: Fix kmsgdump parameter renaming.
2024-07-19 15:24 [PATCH] mtd: mtdoops: Fix kmsgdump parameter renaming Jocelyn Falempe
@ 2024-07-22 15:21 ` Richard Weinberger
2024-07-22 16:33 ` Jocelyn Falempe
0 siblings, 1 reply; 3+ messages in thread
From: Richard Weinberger @ 2024-07-22 15:21 UTC (permalink / raw)
To: Jocelyn Falempe
Cc: Miquel Raynal, Vignesh Raghavendra, linux-mtd, linux-kernel,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Daniel Vetter, DRI mailing list, Knop Ryszard
----- 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@intel.com>
> Signed-off-by: Jocelyn Falempe <jfalempe@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@nod.at>
Thanks,
//richard
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] mtd: mtdoops: Fix kmsgdump parameter renaming.
2024-07-22 15:21 ` Richard Weinberger
@ 2024-07-22 16:33 ` Jocelyn Falempe
0 siblings, 0 replies; 3+ messages in thread
From: Jocelyn Falempe @ 2024-07-22 16:33 UTC (permalink / raw)
To: Richard Weinberger
Cc: Miquel Raynal, Vignesh Raghavendra, linux-mtd, linux-kernel,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Daniel Vetter, DRI mailing list, Knop Ryszard
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@intel.com>
>> Signed-off-by: Jocelyn Falempe <jfalempe@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@nod.at>
I pushed it to drm-misc-next.
Thanks a lot.
>
> Thanks,
> //richard
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-22 16:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-19 15:24 [PATCH] mtd: mtdoops: Fix kmsgdump parameter renaming Jocelyn Falempe
2024-07-22 15:21 ` Richard Weinberger
2024-07-22 16:33 ` Jocelyn Falempe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®