summaryrefslogtreecommitdiff
path: root/arch/x86/um/bugs_64.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2024-05-31 14:09:20 -0700
committerJakub Kicinski <kuba@kernel.org>2024-05-31 14:10:28 -0700
commite19de2064fdf6f1f2488e36cf3927c3f1d01803c (patch)
tree3af14944616afdc409c97e012fb3d82cd1fa78ff /arch/x86/um/bugs_64.c
parentccf23c916ca35239a924ec8649cc88b1ef25d3d9 (diff)
parentd8ec19857b095b39d114ae299713bd8ea6c1e66a (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/ti/icssg/icssg_classifier.c abd5576b9c57 ("net: ti: icssg-prueth: Add support for ICSSG switch firmware") 56a5cf538c3f ("net: ti: icssg-prueth: Fix start counter for ft1 filter") https://lore.kernel.org/all/20240531123822.3bb7eadf@canb.auug.org.au/ No other adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/x86/um/bugs_64.c')
-rw-r--r--arch/x86/um/bugs_64.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/um/bugs_64.c b/arch/x86/um/bugs_64.c
index 8cc8256c698d..b01295e8a676 100644
--- a/arch/x86/um/bugs_64.c
+++ b/arch/x86/um/bugs_64.c
@@ -4,6 +4,7 @@
* Licensed under the GPL
*/
+#include <arch.h>
#include <sysdep/ptrace.h>
void arch_check_bugs(void)