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

PATCH In review David Gow 3 participants 3 messages Apr 25, 2020 User-mode Linux (UML)

Share & tools

David Gow

author

2020-04-25 04:28 UTC #0 lore raw

PATCH 1/1 um: Fix "time-internal.h" include in xor.h

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 <[email protected]>

---
 arch/um/include/asm/xor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/um/include/asm/xor.h +1 -1

index 7a3208c47cfc..36b33d62a35d 100644
@@ -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)	\

Signature · 1 line

2.26.2.303.gf8c07b1a785-goog

Johannes Berg

maintainer

2020-04-25 08:26 UTC #1 lore raw

Quoted 10 lines · 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>
| ^~~~~~~~~~~~~~~~~~~~~~~~~
----------------------

Quoted 3 lines

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

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

Richard Weinberger

maintainer

2020-04-25 08:49 UTC #2 lore raw

----- Ursprüngliche Mail -----

Quoted 22 lines

Von: "Johannes Berg" <[email protected]>
An: "davidgow" <[email protected]>, "anton ivanov" <[email protected]>, "richard" <[email protected]>
CC: "linux-um" <[email protected]>, "linux-kernel" <[email protected]>
Gesendet: Samstag, 25. April 2020 10:26:04
Betreff: Re: [PATCH] um: Fix "time-internal.h" include in xor.h
Quoted 11 lines · 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>
| ^~~~~~~~~~~~~~~~~~~~~~~~~
----------------------
Quoted 3 lines
Replacing this with "linux/time-internal.h" builds fine.
Fixes d65197ad5249 ("um: fix time-travel=inf-cpu with xor/raid6")

Quoted 8 lines

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