Commit 91080ab3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull UML updates from Richard Weinberger:

 - Move to strscpy()

 - Improve panic notifiers

 - Fix NR_CPUS usage

 - Fixes for various comments

 - Fixes for virtio driver

* tag 'for-linus-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
  uml: Remove the initialization of statics to 0
  um: Do not initialise statics to 0.
  um: Fix comment typo
  um: Improve panic notifiers consistency and ordering
  um: remove unused reactivate_chan() declaration
  um: mmaper: add __exit annotations to module exit funcs
  um: virt-pci: add __init/__exit annotations to module init/exit funcs
  hostfs: move from strlcpy with unused retval to strscpy
  um: move from strlcpy with unused retval to strscpy
  um: increase default virtual physical memory to 64 MiB
  UM: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK
  um: read multiple msg from virtio slave request fd
parents 73344a3f 193cb837

arch/um/drivers/chan.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ extern int console_write_chan(struct chan *chan, const char *buf, 
			      int len);

extern int console_open_chan(struct line *line, struct console *co);

extern void deactivate_chan(struct chan *chan, int irq);

extern void reactivate_chan(struct chan *chan, int irq);

extern void chan_enable_winch(struct chan *chan, struct tty_port *port);

extern int enable_chan(struct line *line);

extern void close_chan(struct line *line);

arch/um/drivers/mconsole_kern.c

+4 −5
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ struct unplugged_pages { 
};



static DEFINE_MUTEX(plug_mem_mutex);

static unsigned long long unplugged_pages_count = 0;

static unsigned long long unplugged_pages_count;

static LIST_HEAD(unplugged_pages);

static int unplug_index = UNPLUGGED_PER_PAGE;
@@ -846,13 +846,12 @@ static int notify_panic(struct notifier_block *self, unsigned long unused1, 


	mconsole_notify(notify_socket, MCONSOLE_PANIC, message,

			strlen(message) + 1);

	return 0;

	return NOTIFY_DONE;

}



static struct notifier_block panic_exit_notifier = {

	.notifier_call	= notify_panic,

	.next 			= NULL,

	.priority 		= 1

	.priority	= INT_MAX, /* run as soon as possible */

};



static int add_notifier(void)

arch/um/drivers/mmapper_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int __init mmapper_init(void) 
	return 0;

}



static void mmapper_exit(void)

static void __exit mmapper_exit(void)

{

	misc_deregister(&mmapper_dev);

}

arch/um/drivers/net_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void uml_net_poll_controller(struct net_device *dev) 
static void uml_net_get_drvinfo(struct net_device *dev,

				struct ethtool_drvinfo *info)

{

	strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));

	strscpy(info->driver, DRIVER_NAME, sizeof(info->driver));

}



static const struct ethtool_ops uml_net_ethtool_ops = {

arch/um/drivers/ssl.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static const struct tty_operations ssl_ops = { 
/* Changed by ssl_init and referenced by ssl_exit, which are both serialized

 * by being an initcall and exitcall, respectively.

 */

static int ssl_init_done = 0;

static int ssl_init_done;



static void ssl_console_write(struct console *c, const char *string,

			      unsigned len)