Re: [PATCH] um: Fix "time-internal.h" include in xor.h

From: Richard Weinberger
Date: Sat Apr 25 2020 - 04:49:34 EST


----- UrsprÃngliche Mail -----
> Von: "Johannes Berg" <johannes@xxxxxxxxxxxxxxxx>
> An: "davidgow" <davidgow@xxxxxxxxxx>, "anton ivanov" <anton.ivanov@xxxxxxxxxxxxxxxxxx>, "richard" <richard@xxxxxx>
> CC: "linux-um" <linux-um@xxxxxxxxxxxxxxxxxxx>, "linux-kernel" <linux-kernel@xxxxxxxxxxxxxxx>
> Gesendet: Samstag, 25. April 2020 10:26:04
> Betreff: Re: [PATCH] um: Fix "time-internal.h" include in xor.h

> On Fri, 2020-04-24 at 21:28 -0700, David Gow wrote:
>> It looks like the wrong header was included in xor.h, breaking make
>> allyesconfig on UML (or, more specifically, kunit.py run --alltests).
>>
>> ----------------------
>> In file included from crypto/xor.c:17:
>> ./arch/um/include/asm/xor.h:3:10: fatal error: shared/timer-internal.h: No such
>> file or directory
>> 3 | #include <shared/timer-internal.h>
>> | ^~~~~~~~~~~~~~~~~~~~~~~~~
>> ----------------------
>>
>> Replacing this with "linux/time-internal.h" builds fine.
>>
>> Fixes: d65197ad5249 ("um: fix time-travel=inf-cpu with xor/raid6")
>
> Yeah, sorry about that. Some patches overlapped here, i.e. were pending
> from separate branches I had.
>
> I sent Richard a fix quite about three weeks ago:
>
> https://patchwork.ozlabs.org/project/linux-um/patch/20200405213357.b6ce1024b276.I7c370e20580d3122c58df5727ee2d6fb53545576@changeid/
>
> but I guess he hasn't applied it yet.

That's right. I'll prepare a PR with fixes soon.

Thanks,
//richard