Em Thu, 27 Jun 2024 09:50:34 +0200 Borislav Petkov <bp@xxxxxxxxx> escreveu: > On Thu, Jun 27, 2024 at 09:01:08AM +0200, Mauro Carvalho Chehab wrote: > > @@ -570,7 +571,7 @@ static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, > > error_type); > > p += err_info->length; > > } > > - > > +#endif > > return queued; > > The previous version I saw, had it right. "queued" was outside the ifdeffery: > > drivers/acpi/apei/ghes.c: In function ‘ghes_handle_arm_hw_error’: > drivers/acpi/apei/ghes.c:575:16: error: ‘queued’ undeclared (first use in this function) > 575 | return queued; > | ^~~~~~ > drivers/acpi/apei/ghes.c:575:16: note: each undeclared identifier is reported only once for each function it appears in > drivers/acpi/apei/ghes.c:576:1: error: control reaches end of non-void function [-Werror=return-type] > 576 | } > | ^ > cc1: some warnings being treated as errors > make[5]: *** [scripts/Makefile.build:244: drivers/acpi/apei/ghes.o] Error 1 > make[4]: *** [scripts/Makefile.build:485: drivers/acpi/apei] Error 2 > make[4]: *** Waiting for unfinished jobs.... > make[3]: *** [scripts/Makefile.build:485: drivers/acpi] Error 2 > make[3]: *** Waiting for unfinished jobs.... > make[2]: *** [scripts/Makefile.build:485: drivers] Error 2 > make[2]: *** Waiting for unfinished jobs.... > make[1]: *** [/mnt/kernel/kernel/2nd/linux/Makefile:1934: .] Error 2 > make: *** [Makefile:240: __sub-make] Error 2 Sorry, bad conflict resolution during rebase. Will send a v2. Thanks, Mauro
