From: Yazen Ghannam <yazen.ghannam@amd•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>,
Borislav Petkov <bp@alien8•de>, Tony Luck <tony.luck@intel•com>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: yazen.ghannam@amd•com,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the edac tree
Date: Fri, 8 Mar 2024 17:43:26 -0500 [thread overview]
Message-ID: <e367a4ad-3431-4cf8-9c0c-1205e00b907c@amd.com> (raw)
In-Reply-To: <20240227134352.6deda860@canb.auug.org.au>
On 2/26/2024 9:43 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the edac tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/ras/amd/atl/umc.c: In function 'get_die_id':
> drivers/ras/amd/atl/umc.c:318:44: error: implicit declaration of function 'amd_get_nodes_per_socket' [-Werror=implicit-function-declaration]
> 318 | return topology_die_id(err->cpu) % amd_get_nodes_per_socket();
> | ^~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 3f3174996be6 ("RAS: Introduce AMD Address Translation Library")
>
> interacting with commit
>
> c749ce393b8f ("x86/cpu: Use common topology code for AMD")
>
> from the tip tree.
>
> I applied the following merge resolution patch.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 27 Feb 2024 13:22:56 +1100
> Subject: [PATCH] fix up for "RAS: Introduce AMD Address Translation Library"
>
> interacting with "x86/cpu: Use common topology code for AMD"
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/ras/amd/atl/umc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/ras/amd/atl/umc.c b/drivers/ras/amd/atl/umc.c
> index 08c6dbd44c62..65a0ab651ee2 100644
> --- a/drivers/ras/amd/atl/umc.c
> +++ b/drivers/ras/amd/atl/umc.c
> @@ -315,7 +315,7 @@ static u8 get_die_id(struct atl_err *err)
> * For CPUs, this is the AMD Node ID modulo the number
> * of AMD Nodes per socket.
> */
> - return topology_die_id(err->cpu) % amd_get_nodes_per_socket();
> + return topology_die_id(err->cpu) % topology_amd_nodes_per_pkg();
"topology_die_id -> topology_amd_node_id" is also needed.
Does this need to be fixed up in the RAS tree?
Thanks,
Yazen
next prev parent reply other threads:[~2024-03-08 22:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 2:43 linux-next: build failure after merge of the edac tree Stephen Rothwell
2024-03-08 22:43 ` Yazen Ghannam [this message]
2024-03-09 9:46 ` Borislav Petkov
2024-03-11 13:06 ` Yazen Ghannam
-- strict thread matches above, loose matches on Subject: below --
2011-11-01 6:00 Stephen Rothwell
2011-11-01 11:58 ` Mauro Carvalho Chehab
2011-11-01 12:54 ` Borislav Petkov
2011-11-01 13:00 ` Mauro Carvalho Chehab
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=e367a4ad-3431-4cf8-9c0c-1205e00b907c@amd.com \
--to=yazen.ghannam@amd$(echo .)com \
--cc=bp@alien8$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+samsung@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
--cc=tony.luck@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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