Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42947cb9 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: some harmless sparse warning fixes 



Fix some simple sparse warnings - a lot more staticness and a misplaced
__user.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4cd7ed94

arch/um/drivers/chan_kern.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -403,7 +403,7 @@ int chan_window_size(struct list_head *chans, unsigned short *rows_out, 
	return 0;

	return 0;

}

}





void free_one_chan(struct chan *chan, int delay_free_irq)

static void free_one_chan(struct chan *chan, int delay_free_irq)

{

{

	list_del(&chan->list);

	list_del(&chan->list);
@@ -416,7 +416,7 @@ void free_one_chan(struct chan *chan, int delay_free_irq) 
	kfree(chan);

	kfree(chan);

}

}





void free_chan(struct list_head *chans, int delay_free_irq)

static void free_chan(struct list_head *chans, int delay_free_irq)

{

{

	struct list_head *ele, *next;

	struct list_head *ele, *next;

	struct chan *chan;

	struct chan *chan;
@@ -497,7 +497,7 @@ struct chan_type { 
	struct chan_ops *ops;

	struct chan_ops *ops;

};

};





struct chan_type chan_table[] = {

static struct chan_type chan_table[] = {

	{ "fd", &fd_ops },

	{ "fd", &fd_ops },





#ifdef CONFIG_NULL_CHAN

#ifdef CONFIG_NULL_CHAN

arch/um/drivers/daemon_kern.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ struct daemon_init { 
	char *ctl_sock;

	char *ctl_sock;

};

};





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

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

{

{

	struct uml_net_private *pri;

	struct uml_net_private *pri;

	struct daemon_data *dpri;

	struct daemon_data *dpri;
@@ -64,7 +64,7 @@ static struct net_kern_info daemon_kern_info = { 
	.write			= daemon_write,

	.write			= daemon_write,

};

};





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

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

{

{

	struct daemon_init *init = data;

	struct daemon_init *init = data;

	char *remain;

	char *remain;

arch/um/drivers/line.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -714,7 +714,7 @@ struct winch { 
	struct tty_struct *tty;

	struct tty_struct *tty;

};

};





irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused)

static irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused)

{

{

	struct winch *winch = data;

	struct winch *winch = data;

	struct tty_struct *tty;

	struct tty_struct *tty;

arch/um/drivers/mcast_kern.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ struct mcast_init { 
	int ttl;

	int ttl;

};

};





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

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

{

{

	struct uml_net_private *pri;

	struct uml_net_private *pri;

	struct mcast_data *dpri;

	struct mcast_data *dpri;

arch/um/drivers/mconsole_kern.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -327,7 +327,7 @@ void mconsole_stop(struct mc_request *req) 




/* This list is populated by __initcall routines. */

/* This list is populated by __initcall routines. */





LIST_HEAD(mconsole_devices);

static LIST_HEAD(mconsole_devices);





void mconsole_register_dev(struct mc_device *new)

void mconsole_register_dev(struct mc_device *new)

{

{
@@ -561,6 +561,8 @@ void mconsole_sysrq(struct mc_request *req) 
}

}

#endif

#endif





#ifdef CONFIG_MODE_SKAS



static void stack_proc(void *arg)

static void stack_proc(void *arg)

{

{

	struct task_struct *from = current, *to = arg;

	struct task_struct *from = current, *to = arg;
@@ -574,7 +576,7 @@ static void stack_proc(void *arg) 
 *  Dumps a stacks registers to the linux console.

 *  Dumps a stacks registers to the linux console.

 *  Usage stack <pid>.

 *  Usage stack <pid>.

 */

 */

void do_stack(struct mc_request *req)

static void do_stack_trace(struct mc_request *req)

{

{

	char *ptr = req->request.data;

	char *ptr = req->request.data;

	int pid_requested= -1;

	int pid_requested= -1;
@@ -605,6 +607,7 @@ void do_stack(struct mc_request *req) 
	}

	}

	with_console(req, stack_proc, to);

	with_console(req, stack_proc, to);

}

}

#endif /* CONFIG_MODE_SKAS */





void mconsole_stack(struct mc_request *req)

void mconsole_stack(struct mc_request *req)

{

{
@@ -613,7 +616,7 @@ void mconsole_stack(struct mc_request *req) 
	 */

	 */

	CHOOSE_MODE(mconsole_reply(req, "Sorry, this doesn't work in TT mode",

	CHOOSE_MODE(mconsole_reply(req, "Sorry, this doesn't work in TT mode",

				   1, 0),

				   1, 0),

		    do_stack(req));

		    do_stack_trace(req));

}

}





/* Changed by mconsole_setup, which is __setup, and called before SMP is

/* Changed by mconsole_setup, which is __setup, and called before SMP is