Re: [PATCH] move some more intilization out of drivers/char/mem.c

[Andrew Morton <akpm@osdl.org>]

Christoph Hellwig <hch@lst.de> wrote:
>
> > Please compile-test things...
> 
>  Well, I compiled this here.  I see, looks like I lost half of the patch
>  when sending it to you.  Sorryh for that, here's the full patch:

It still generates warnings.  I suggest you build kernels with a script
which saves up stderr and spits it all out at the end.  That way, these
things are noticed.



 drivers/char/random.c |    3 ++-
 drivers/char/tty_io.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff -puN drivers/char/random.c~char-init-cleanup-fix drivers/char/random.c
--- 25/drivers/char/random.c~char-init-cleanup-fix	2003-09-20 23:45:28.000000000 -0700
+++ 25-akpm/drivers/char/random.c	2003-09-20 23:45:46.000000000 -0700
@@ -1493,7 +1493,7 @@ static void init_std_data(struct entropy
 	}
 }
 
-static void __init rand_initialize(void)
+static int __init rand_initialize(void)
 {
 	int i;
 
@@ -1515,6 +1515,7 @@ static void __init rand_initialize(void)
 	memset(&mouse_timer_state, 0, sizeof(struct timer_rand_state));
 	memset(&extract_timer_state, 0, sizeof(struct timer_rand_state));
 	extract_timer_state.dont_count_entropy = 1;
+	return 0;
 }
 module_init(rand_initialize);
 
diff -puN drivers/char/tty_io.c~char-init-cleanup-fix drivers/char/tty_io.c
--- 25/drivers/char/tty_io.c~char-init-cleanup-fix	2003-09-20 23:45:35.000000000 -0700
+++ 25-akpm/drivers/char/tty_io.c	2003-09-20 23:46:06.000000000 -0700
@@ -2423,7 +2423,7 @@ static struct cdev vc0_cdev;
  * Ok, now we can initialize the rest of the tty devices and can count
  * on memory allocations, interrupts etc..
  */
-static void __init tty_init(void)
+static int __init tty_init(void)
 {
 	strcpy(tty_cdev.kobj.name, "dev.tty");
 	cdev_init(&tty_cdev, &tty_fops);
@@ -2512,5 +2512,6 @@ static void __init tty_init(void)
 #ifdef CONFIG_A2232
 	a2232board_init();
 #endif
+	return 0;
 }
 module_init(tty_init);

_