From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Borislav Petkov <bp@alien8.de>
Cc: Daniel Ferguson <danielf@os.amperecomputing.com>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Dan Williams <dan.j.williams@intel.com>,
Dave Jiang <dave.jiang@intel.com>,
Ira Weiny <ira.weiny@intel.com>,
James Morse <james.morse@arm.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Len Brown <lenb@kernel.org>,
Shengwei Luo <luoshengwei@huawei.com>,
Shiju Jose <shiju.jose@huawei.com>,
Shuai Xue <xueshuai@linux.alibaba.com>,
Tony Luck <tony.luck@intel.com>,
linux-acpi@vger.kernel.org, linux-edac@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] RAS: ACPI: APEI: add conditional compilation to ARM error report functions
Date: Thu, 27 Jun 2024 12:31:31 +0200 [thread overview]
Message-ID: <20240627123131.39321114@coco.lan> (raw)
In-Reply-To: <20240627075034.GBZn0Zyj_3n8XnKOQm@fat_crate.local>
Em Thu, 27 Jun 2024 09:50:34 +0200
Borislav Petkov <bp@alien8.de> 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
next prev parent reply other threads:[~2024-06-27 10:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-27 7:01 [PATCH 0/2] Add other fields to ARM trace event Mauro Carvalho Chehab
2024-06-27 7:01 ` [PATCH 1/2] RAS: ACPI: APEI: add conditional compilation to ARM error report functions Mauro Carvalho Chehab
2024-06-27 7:50 ` Borislav Petkov
2024-06-27 10:31 ` Mauro Carvalho Chehab [this message]
2024-06-28 4:46 ` kernel test robot
2024-06-28 6:04 ` kernel test robot
2024-06-27 7:01 ` [PATCH 2/2] RAS: Report all ARM processor CPER information to userspace Mauro Carvalho Chehab
2024-06-28 5:41 ` kernel test robot
2024-06-28 9:52 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240627123131.39321114@coco.lan \
--to=mchehab+huawei@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=bp@alien8.de \
--cc=dan.j.williams@intel.com \
--cc=danielf@os.amperecomputing.com \
--cc=dave.jiang@intel.com \
--cc=ira.weiny@intel.com \
--cc=james.morse@arm.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luoshengwei@huawei.com \
--cc=rafael@kernel.org \
--cc=shiju.jose@huawei.com \
--cc=tony.luck@intel.com \
--cc=xueshuai@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox