Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] uml: some harmless sparse warning fixes

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

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Paolo 'Blaisorblade' Giarrusso and committed by
Linus Torvalds
42947cb9 4cd7ed94

+17 -14
+3 -3
arch/um/drivers/chan_kern.c
··· 403 403 return 0; 404 404 } 405 405 406 - void free_one_chan(struct chan *chan, int delay_free_irq) 406 + static void free_one_chan(struct chan *chan, int delay_free_irq) 407 407 { 408 408 list_del(&chan->list); 409 409 ··· 416 416 kfree(chan); 417 417 } 418 418 419 - void free_chan(struct list_head *chans, int delay_free_irq) 419 + static void free_chan(struct list_head *chans, int delay_free_irq) 420 420 { 421 421 struct list_head *ele, *next; 422 422 struct chan *chan; ··· 497 497 struct chan_ops *ops; 498 498 }; 499 499 500 - struct chan_type chan_table[] = { 500 + static struct chan_type chan_table[] = { 501 501 { "fd", &fd_ops }, 502 502 503 503 #ifdef CONFIG_NULL_CHAN
+2 -2
arch/um/drivers/daemon_kern.c
··· 18 18 char *ctl_sock; 19 19 }; 20 20 21 - void daemon_init(struct net_device *dev, void *data) 21 + static void daemon_init(struct net_device *dev, void *data) 22 22 { 23 23 struct uml_net_private *pri; 24 24 struct daemon_data *dpri; ··· 64 64 .write = daemon_write, 65 65 }; 66 66 67 - int daemon_setup(char *str, char **mac_out, void *data) 67 + static int daemon_setup(char *str, char **mac_out, void *data) 68 68 { 69 69 struct daemon_init *init = data; 70 70 char *remain;
+1 -1
arch/um/drivers/line.c
··· 714 714 struct tty_struct *tty; 715 715 }; 716 716 717 - irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused) 717 + static irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused) 718 718 { 719 719 struct winch *winch = data; 720 720 struct tty_struct *tty;
+1 -1
arch/um/drivers/mcast_kern.c
··· 26 26 int ttl; 27 27 }; 28 28 29 - void mcast_init(struct net_device *dev, void *data) 29 + static void mcast_init(struct net_device *dev, void *data) 30 30 { 31 31 struct uml_net_private *pri; 32 32 struct mcast_data *dpri;
+6 -3
arch/um/drivers/mconsole_kern.c
··· 327 327 328 328 /* This list is populated by __initcall routines. */ 329 329 330 - LIST_HEAD(mconsole_devices); 330 + static LIST_HEAD(mconsole_devices); 331 331 332 332 void mconsole_register_dev(struct mc_device *new) 333 333 { ··· 561 561 } 562 562 #endif 563 563 564 + #ifdef CONFIG_MODE_SKAS 565 + 564 566 static void stack_proc(void *arg) 565 567 { 566 568 struct task_struct *from = current, *to = arg; ··· 576 574 * Dumps a stacks registers to the linux console. 577 575 * Usage stack <pid>. 578 576 */ 579 - void do_stack(struct mc_request *req) 577 + static void do_stack_trace(struct mc_request *req) 580 578 { 581 579 char *ptr = req->request.data; 582 580 int pid_requested= -1; ··· 607 605 } 608 606 with_console(req, stack_proc, to); 609 607 } 608 + #endif /* CONFIG_MODE_SKAS */ 610 609 611 610 void mconsole_stack(struct mc_request *req) 612 611 { ··· 616 613 */ 617 614 CHOOSE_MODE(mconsole_reply(req, "Sorry, this doesn't work in TT mode", 618 615 1, 0), 619 - do_stack(req)); 616 + do_stack_trace(req)); 620 617 } 621 618 622 619 /* Changed by mconsole_setup, which is __setup, and called before SMP is
+3 -3
arch/um/drivers/ssl.c
··· 33 33 34 34 #define NR_PORTS 64 35 35 36 - void ssl_announce(char *dev_name, int dev) 36 + static void ssl_announce(char *dev_name, int dev) 37 37 { 38 38 printk(KERN_INFO "Serial line %d assigned device '%s'\n", dev, 39 39 dev_name); ··· 98 98 return line_remove(serial_lines, ARRAY_SIZE(serial_lines), n); 99 99 } 100 100 101 - int ssl_open(struct tty_struct *tty, struct file *filp) 101 + static int ssl_open(struct tty_struct *tty, struct file *filp) 102 102 { 103 103 return line_open(serial_lines, tty); 104 104 } ··· 182 182 .index = -1, 183 183 }; 184 184 185 - int ssl_init(void) 185 + static int ssl_init(void) 186 186 { 187 187 char *new_title; 188 188
+1 -1
arch/um/kernel/exec_kern.c
··· 33 33 extern void log_exec(char **argv, void *tty); 34 34 35 35 static long execve1(char *file, char __user * __user *argv, 36 - char *__user __user *env) 36 + char __user *__user *env) 37 37 { 38 38 long error; 39 39