kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/um/drivers/Makefile
..
..
@@ -1,6 +1,6 @@
1
+# SPDX-License-Identifier: GPL-2.0
1
2
 # 
2
3
 # Copyright (C) 2000, 2002, 2003 Jeff Dike (jdike@karaya.com)
3
-# Licensed under the GPL
4
4
 #
5
5
 
6
6
 # pcap is broken in 2.5 because kbuild doesn't allow pcap.a to be linked
..
..
@@ -18,9 +18,9 @@
18
18
 port-objs := port_kern.o port_user.o
19
19
 harddog-objs := harddog_kern.o harddog_user.o
20
20
 
21
-LDFLAGS_pcap.o := -r $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libpcap.a)
21
+LDFLAGS_pcap.o = $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libpcap.a)
22
22
 
23
-LDFLAGS_vde.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a)
23
+LDFLAGS_vde.o = $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a)
24
24
 
25
25
 targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o
26
26
 
..
..
@@ -61,6 +61,7 @@
61
61
 obj-$(CONFIG_UML_WATCHDOG) += harddog.o
62
62
 obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
63
63
 obj-$(CONFIG_UML_RANDOM) += random.o
64
+obj-$(CONFIG_VIRTIO_UML) += virtio_uml.o
64
65
 
65
66
 # pcap_user.o must be added explicitly.
66
67
 USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o vector_user.o