Commit 2313022e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'uml-for-linus-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux 

Pull UML updates from Richard Weinberger:

 - Fixes for -Wmissing-prototypes warnings and further cleanup

 - Remove callback returning void from rtc and virtio drivers

 - Fix bash location

* tag 'uml-for-linus-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux: (26 commits)
  um: virtio_uml: Convert to platform remove callback returning void
  um: rtc: Convert to platform remove callback returning void
  um: Remove unused do_get_thread_area function
  um: Fix -Wmissing-prototypes warnings for __vdso_*
  um: Add an internal header shared among the user code
  um: Fix the declaration of kasan_map_memory
  um: Fix the -Wmissing-prototypes warning for get_thread_reg
  um: Fix the -Wmissing-prototypes warning for __switch_mm
  um: Fix -Wmissing-prototypes warnings for (rt_)sigreturn
  um: Stop tracking host PID in cpu_tasks
  um: process: remove unused 'n' variable
  um: vector: remove unused len variable/calculation
  um: vector: fix bpfflash parameter evaluation
  um: slirp: remove set but unused variable 'pid'
  um: signal: move pid variable where needed
  um: Makefile: use bash from the environment
  um: Add winch to winch_handlers before registering winch IRQ
  um: Fix -Wmissing-prototypes warnings for __warp_* and foo
  um: Fix -Wmissing-prototypes warnings for text_poke*
  um: Move declarations to proper headers
  ...
parents 56fb6f92 919e3ece

arch/um/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ endif 
ARCH_DIR := arch/um

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

# features.

SHELL := /bin/bash

SHELL := bash



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

arch/um/drivers/line.c

+8 −6
Original line number Diff line number Diff line
@@ -676,23 +676,25 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_port *port, 
		goto cleanup;

	}



	*winch = ((struct winch) { .list  	= LIST_HEAD_INIT(winch->list),

				   .fd  	= fd,

	*winch = ((struct winch) { .fd  	= fd,

				   .tty_fd 	= tty_fd,

				   .pid  	= pid,

				   .port 	= port,

				   .stack	= stack });



	spin_lock(&winch_handler_lock);

	list_add(&winch->list, &winch_handlers);

	spin_unlock(&winch_handler_lock);



	if (um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,

			   IRQF_SHARED, "winch", winch) < 0) {

		printk(KERN_ERR "register_winch_irq - failed to register "

		       "IRQ\n");

		goto out_free;

	}



		spin_lock(&winch_handler_lock);

	list_add(&winch->list, &winch_handlers);

		list_del(&winch->list);

		spin_unlock(&winch_handler_lock);

		goto out_free;

	}



	return;

arch/um/drivers/pcap_kern.c

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct pcap_init { 
	char *filter;

};



void pcap_init_kern(struct net_device *dev, void *data)

static void pcap_init_kern(struct net_device *dev, void *data)

{

	struct uml_net_private *pri;

	struct pcap_data *ppri;
@@ -50,7 +50,7 @@ static const struct net_kern_info pcap_kern_info = { 
	.write			= pcap_write,

};



int pcap_setup(char *str, char **mac_out, void *data)

static int pcap_setup(char *str, char **mac_out, void *data)

{

	struct pcap_init *init = data;

	char *remain, *host_if = NULL, *options[2] = { NULL, NULL };

arch/um/drivers/rtc_kern.c

+2 −3
Original line number Diff line number Diff line
@@ -168,16 +168,15 @@ static int uml_rtc_probe(struct platform_device *pdev) 
	return err;

}



static int uml_rtc_remove(struct platform_device *pdev)

static void uml_rtc_remove(struct platform_device *pdev)

{

	device_init_wakeup(&pdev->dev, 0);

	uml_rtc_cleanup();

	return 0;

}



static struct platform_driver uml_rtc_driver = {

	.probe = uml_rtc_probe,

	.remove = uml_rtc_remove,

	.remove_new = uml_rtc_remove,

	.driver = {

		.name = "uml-rtc",

	},

arch/um/drivers/slirp_user.c

+1 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static int slirp_tramp(char **argv, int fd) 
static int slirp_open(void *data)

{

	struct slirp_data *pri = data;

	int fds[2], pid, err;

	int fds[2], err;



	err = os_pipe(fds, 1, 1);

	if (err)
@@ -60,7 +60,6 @@ static int slirp_open(void *data) 
		printk(UM_KERN_ERR "slirp_tramp failed - errno = %d\n", -err);

		goto out;

	}

	pid = err;



	pri->slave = fds[1];

	pri->slip.pos = 0;