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

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

[David Gow]

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")
Signed-off-by: David Gow <davidgow@google.com>
---
 arch/um/include/asm/xor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h
index 7a3208c47cfc..36b33d62a35d 100644
--- a/arch/um/include/asm/xor.h
+++ b/arch/um/include/asm/xor.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/xor.h>
-#include <shared/timer-internal.h>
+#include <linux/time-internal.h>
 
 /* pick an arbitrary one - measuring isn't possible with inf-cpu */
 #define XOR_SELECT_TEMPLATE(x)	\
-- 
2.26.2.303.gf8c07b1a785-goog

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

[Johannes Berg]

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.

johannes

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

[Richard Weinberger]

----- Ursprüngliche Mail -----
> Von: "Johannes Berg" <johannes@sipsolutions.net>
> An: "davidgow" <davidgow@google.com>, "anton ivanov" <anton.ivanov@cambridgegreys.com>, "richard" <richard@nod.at>
> CC: "linux-um" <linux-um@lists.infradead.org>, "linux-kernel" <linux-kernel@vger.kernel.org>
> 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