Commit 68d76d4e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0b90c563 974b808d

arch/um/Kbuild

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



obj-y += kernel/ drivers/ os-Linux/

arch/um/Makefile

+2 −7
Original line number Diff line number Diff line
@@ -18,15 +18,10 @@ else 
endif



ARCH_DIR := arch/um

OS := $(shell uname -s)

# We require bash because the vmlinux link and loader script cpp use bash

# features.

SHELL := /bin/bash



core-y			+= $(ARCH_DIR)/kernel/		\

			   $(ARCH_DIR)/drivers/		\

			   $(ARCH_DIR)/os-$(OS)/



MODE_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared/skas



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



#This will adjust *FLAGS accordingly to the platform.

include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)

include $(srctree)/$(ARCH_DIR)/Makefile-os-Linux



KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \

		   -I$(srctree)/$(HOST_DIR)/include/uapi \
@@ -155,4 +150,4 @@ archclean: 
	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \

		-o -name '*.gcov' \) -type f -print | xargs rm -f



export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH
 
export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING DEV_NULL_PATH

arch/um/configs/i386_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ CONFIG_TTY_CHAN=y 
CONFIG_XTERM_CHAN=y

CONFIG_CON_CHAN="pts"

CONFIG_SSL_CHAN="pts"

CONFIG_SOUND=m

CONFIG_UML_SOUND=m

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

arch/um/configs/x86_64_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ CONFIG_TTY_CHAN=y 
CONFIG_XTERM_CHAN=y

CONFIG_CON_CHAN="pts"

CONFIG_SSL_CHAN="pts"

CONFIG_SOUND=m

CONFIG_UML_SOUND=m

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

arch/um/drivers/Kconfig

+3 −13
Original line number Diff line number Diff line
@@ -111,24 +111,14 @@ config SSL_CHAN 


config UML_SOUND

	tristate "Sound support"

	depends on SOUND

	select SOUND_OSS_CORE

	help

	  This option enables UML sound support.  If enabled, it will pull in

	  soundcore and the UML hostaudio relay, which acts as a intermediary

	  the UML hostaudio relay, which acts as a intermediary

	  between the host's dsp and mixer devices and the UML sound system.

	  It is safe to say 'Y' here.



config SOUND

	tristate

	default UML_SOUND



config SOUND_OSS_CORE

	bool

	default UML_SOUND



config HOSTAUDIO

	tristate

	default UML_SOUND



endmenu



menu "UML Network Devices"