Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 68d76d4

Browse files
torvaldstorvalds
committed
Merge tag 'uml-for-linus-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux
Pull UML updates from Richard Weinberger: - Drop 32-bit checksum implementation and re-use it from arch/x86 - String function cleanup - Fixes for -Wmissing-variable-declarations and -Wmissing-prototypes builds * tag 'uml-for-linus-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux: um: virt-pci: fix missing declaration warning um: Refactor deprecated strncpy to memcpy um: fix 3 instances of -Wmissing-prototypes um: port_kern: fix -Wmissing-variable-declarations uml: audio: fix -Wmissing-variable-declarations um: vector: refactor deprecated strncpy um: use obj-y to descend into arch/um/*/ um: Hard-code the result of 'uname -s' um: Use the x86 checksum implementation on 32-bit asm-generic: current: Don't include thread-info.h if building asm um: Remove unsued extern declaration ldt_host_info() um: Fix hostaudio build errors um: Remove strlcpy usage
2 parents 0b90c56 + 974b808 commit 68d76d4

File tree

18 files changed

+23
-245
lines changed

18 files changed

+23
-245
lines changed

‎arch/um/Kbuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
obj-y += kernel/ drivers/ os-Linux/

‎arch/um/Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,10 @@ else
1818
endif
1919

2020
ARCH_DIR := arch/um
21-
OS := $(shell uname -s)
2221
# We require bash because the vmlinux link and loader script cpp use bash
2322
# features.
2423
SHELL := /bin/bash
2524

26-
core-y += $(ARCH_DIR)/kernel/ \
27-
$(ARCH_DIR)/drivers/ \
28-
$(ARCH_DIR)/os-$(OS)/
29-
3025
MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas
3126

3227
HEADER_ARCH := $(SUBARCH)
@@ -78,7 +73,7 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \
7873
-idirafter $(objtree)/include -D__KERNEL__ -D__UM_HOST__
7974

8075
#This will adjust *FLAGS accordingly to the platform.
81-
include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
76+
include $(srctree)/$(ARCH_DIR)/Makefile-os-Linux
8277

8378
KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \
8479
-I$(srctree)/$(HOST_DIR)/include/uapi \
@@ -155,4 +150,4 @@ archclean:
155150
@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
156151
-o -name '*.gcov' \) -type f -print | xargs rm -f
157152

158-
export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH
153+
export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING DEV_NULL_PATH

‎arch/um/configs/i386_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ CONFIG_TTY_CHAN=y
3434
CONFIG_XTERM_CHAN=y
3535
CONFIG_CON_CHAN="pts"
3636
CONFIG_SSL_CHAN="pts"
37+
CONFIG_SOUND=m
3738
CONFIG_UML_SOUND=m
3839
CONFIG_DEVTMPFS=y
3940
CONFIG_DEVTMPFS_MOUNT=y

‎arch/um/configs/x86_64_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ CONFIG_TTY_CHAN=y
3232
CONFIG_XTERM_CHAN=y
3333
CONFIG_CON_CHAN="pts"
3434
CONFIG_SSL_CHAN="pts"
35+
CONFIG_SOUND=m
3536
CONFIG_UML_SOUND=m
3637
CONFIG_DEVTMPFS=y
3738
CONFIG_DEVTMPFS_MOUNT=y

‎arch/um/drivers/Kconfig

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -111,24 +111,14 @@ config SSL_CHAN
111111

112112
config UML_SOUND
113113
tristate "Sound support"
114+
depends on SOUND
115+
select SOUND_OSS_CORE
114116
help
115117
This option enables UML sound support. If enabled, it will pull in
116-
soundcore and the UML hostaudio relay, which acts as a intermediary
118+
the UML hostaudio relay, which acts as a intermediary
117119
between the host's dsp and mixer devices and the UML sound system.
118120
It is safe to say 'Y' here.
119121

120-
config SOUND
121-
tristate
122-
default UML_SOUND
123-
124-
config SOUND_OSS_CORE
125-
bool
126-
default UML_SOUND
127-
128-
config HOSTAUDIO
129-
tristate
130-
default UML_SOUND
131-
132122
endmenu
133123

134124
menu "UML Network Devices"

‎arch/um/drivers/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ obj-$(CONFIG_UML_NET) += net.o
5454
obj-$(CONFIG_MCONSOLE) += mconsole.o
5555
obj-$(CONFIG_MMAPPER) += mmapper_kern.o
5656
obj-$(CONFIG_BLK_DEV_UBD) += ubd.o
57-
obj-$(CONFIG_HOSTAUDIO) += hostaudio.o
57+
obj-$(CONFIG_UML_SOUND) += hostaudio.o
5858
obj-$(CONFIG_NULL_CHAN) += null.o
5959
obj-$(CONFIG_PORT_CHAN) += port.o
6060
obj-$(CONFIG_PTY_CHAN) += pty.o

‎arch/um/drivers/hostaudio_kern.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ static const struct file_operations hostmixer_fops = {
310310
.release = hostmixer_release,
311311
};
312312

313-
struct {
313+
static struct {
314314
int dev_audio;
315315
int dev_mixer;
316316
} module_data;

‎arch/um/drivers/port_kern.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static void port_work_proc(struct work_struct *unused)
144144
local_irq_restore(flags);
145145
}
146146

147-
DECLARE_WORK(port_work, port_work_proc);
147+
static DECLARE_WORK(port_work, port_work_proc);
148148

149149
static irqreturn_t port_interrupt(int irq, void *data)
150150
{

‎arch/um/drivers/slirp_kern.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ struct slirp_init {
1515
struct arg_list_dummy_wrapper argw; /* XXX should be simpler... */
1616
};
1717

18-
void slirp_init(struct net_device *dev, void *data)
18+
static void slirp_init(struct net_device *dev, void *data)
1919
{
2020
struct uml_net_private *private;
2121
struct slirp_data *spri;

‎arch/um/drivers/virt-pci.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,7 @@ static void um_pci_irq_vq_cb(struct virtqueue *vq)
544544
}
545545
}
546546

547+
#ifdef CONFIG_OF
547548
/* Copied from arch/x86/kernel/devicetree.c */
548549
struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)
549550
{
@@ -562,6 +563,7 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)
562563
}
563564
return NULL;
564565
}
566+
#endif
565567

566568
static int um_pci_init_vqs(struct um_pci_device *dev)
567569
{

‎arch/um/drivers/xterm_kern.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <asm/irq.h>
1010
#include <irq_kern.h>
1111
#include <os.h>
12+
#include "xterm.h"
1213

1314
struct xterm_wait {
1415
struct completion ready;

‎arch/um/include/shared/irq_kern.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,5 @@ static inline bool um_irq_timetravel_handler_used(void)
7676
}
7777

7878
void um_free_irq(int irq, void *dev_id);
79+
void free_irqs(void);
7980
#endif

‎arch/um/kernel/irq.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include <linux/time-internal.h>
2424

2525

26-
extern void free_irqs(void);
27-
2826
/* When epoll triggers we do not know why it did so
2927
* we can also have different IRQs for read and write.
3028
* This is why we keep a small irq_reg array for each fd -

‎arch/x86/um/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ obj-y = bugs_$(BITS).o delay.o fault.o ldt.o \
1313
ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \
1414
stub_$(BITS).o stub_segv.o \
1515
sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \
16-
mem_$(BITS).o subarch.o os-$(OS)/
16+
mem_$(BITS).o subarch.o os-Linux/
1717

1818
ifeq ($(CONFIG_X86_32),y)
1919

20-
obj-y += checksum_32.o syscalls_32.o
20+
obj-y += syscalls_32.o
2121
obj-$(CONFIG_ELF_CORE) += elfcore.o
2222

2323
subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o
2424
subarch-y += ../lib/cmpxchg8b_emu.o ../lib/atomic64_386_32.o
25+
subarch-y += ../lib/checksum_32.o
2526
subarch-y += ../kernel/sys_ia32.o
2627

2728
else

‎arch/x86/um/asm/mm_context.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#include <linux/mutex.h>
1212
#include <asm/ldt.h>
1313

14-
extern void ldt_host_info(void);
15-
1614
#define LDT_PAGES_MAX \
1715
((LDT_ENTRIES * LDT_ENTRY_SIZE)/PAGE_SIZE)
1816
#define LDT_ENTRIES_PER_PAGE \

‎arch/x86/um/checksum_32.S

Lines changed: 0 additions & 214 deletions
This file was deleted.

0 commit comments

Comments
 (0)