On Mon, 15 Sep 2025 09:40:35 +0200, Arnd Bergmann wrote: > On Sun, Sep 14, 2025, at 17:56, Tiwei Bie wrote: > > From: Tiwei Bie <tiwei....@antgroup.com> > > > > Currently, asm/percpu.h is directly or indirectly included by > > some assembly files on x86. Some of them (e.g., checksum_32.S) > > are also used on um. But x86 and um provide different versions > > of asm/percpu.h -- um uses asm-generic/percpu.h directly. > > > > When SMP is enabled, asm-generic/percpu.h will introduce C code > > that cannot be assembled. Since asm-generic/percpu.h currently > > is not designed for use in assembly, and these assembly files > > do not actually need asm/percpu.h on um, let's add the assembly > > guard in asm-generic/percpu.h to fix this issue. > > > > Cc: Arnd Bergmann <a...@arndb.de> > > Cc: linux-a...@vger.kernel.org > > Signed-off-by: Tiwei Bie <tiwei....@antgroup.com> > > Have you tried if you can remove the percpu.h dependency from > the files that currently include it? In many cases it should > be enough to use percpu-defs.h.
It doesn't seem to work. The indirect inclusion of asm/percpu.h comes from asm/nospec-branch.h, which expands DECLARE_PER_CPU() and thus requires asm/percpu.h. > > If that doesn't work, I have no objections to this patch either. > > Acked-by: Arnd Bergmann <a...@arndb.de> Thanks! :) Regards, Tiwei
