[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200425042814.132920-1-davidgow@google.com>
Date: Fri, 24 Apr 2020 21:28:14 -0700
From: David Gow <davidgow@...gle.com>
To: Johannes Berg <johannes.berg@...el.com>,
Anton Ivanov <anton.ivanov@...bridgegreys.com>,
Richard Weinberger <richard@....at>
Cc: linux-um@...ts.infradead.org, linux-kernel@...r.kernel.org,
David Gow <davidgow@...gle.com>
Subject: [PATCH] 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 <davidgow@...gle.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
Powered by blists - more mailing lists