Re: [PATCH 20/25] xor: make xor.ko self-contained in lib/raid/

Christoph Hellwig
2026-03-03T16:06:40Z

On Fri, Feb 27, 2026 at 10:42:49PM -0800, Eric Biggers wrote:
> On Thu, Feb 26, 2026 at 07:10:32AM -0800, Christoph Hellwig wrote:
> > diff --git a/arch/um/include/asm/xor.h b/lib/raid/xor/um/xor_arch.h
> > similarity index 61%
> > rename from arch/um/include/asm/xor.h
> > rename to lib/raid/xor/um/xor_arch.h
> > index c9ddedc19301..c75cd9caf792 100644
> > --- a/arch/um/include/asm/xor.h
> > +++ b/lib/raid/xor/um/xor_arch.h
> > @@ -1,7 +1,4 @@
> > /* SPDX-License-Identifier: GPL-2.0 */
> > -#ifndef _ASM_UM_XOR_H
> > -#define _ASM_UM_XOR_H
> > -
> > #ifdef CONFIG_64BIT
> > #undef CONFIG_X86_32
> > #else
> > #define CONFIG_X86_32 1
> > #endif
>
> Due to this change, the above code that sets CONFIG_X86_32 to the
> opposite of CONFIG_64BIT is no longer included in xor-sse.c, which uses
> CONFIG_X86_32. So if the above code actually did anything, this change
> would have broken it for xor-sse.c. However, based on
> arch/x86/um/Kconfig, CONFIG_X86_32 is always the opposite of
> CONFIG_64BIT, so the above code actually has no effect. Does that sound
> right?

This whole thing looked weird to me. I'll try to do a more extensive
cleanup pass on the um mess ahead of the rest of the series.