Messages in this thread Patch in this message | | | Date | Tue, 12 Aug 1997 16:01:14 +0200 | From | Florian La Roche <> | Subject | 2.1.49 |
| |
Sorry for sending Linus a not enough tested patch. Here is a collection of all corrected things.
Thanks a lot,
Florian La Roche
P.S.: Running 2.1.48 I cannot mount another 2.0.30-NFS-Server and I also cannot start the new kernel nfs-server 0.4.21 from Olaf Kirch. If you do, please write me a short message, then I know that searching my configuration fault is worth it. (Anyway, I am back to changing all servers to 2.0.31-pre4...)
--- drivers/misc/parport_pc.c +++ drivers/misc/parport_pc.c 1997/08/12 07:03:06 @@ -322,7 +322,6 @@ return dma; } -#if 0 /* Only called if port supports ECP mode. * * The only restriction on DMA channels is that it has to be @@ -388,7 +387,6 @@ return retv; } -#endif /****************************************************** * MODE detection section: --- drivers/misc/parport_share.c +++ drivers/misc/parport_share.c 1997/08/12 07:03:06 @@ -19,6 +19,11 @@ #include <linux/kernel.h> #include <linux/malloc.h> +#ifdef CONFIG_KERNELD +#include <linux/kerneld.h> +#endif + + #undef PARPORT_PARANOID static struct parport *portlist = NULL, *portlist_tail = NULL; @@ -27,6 +32,10 @@ /* Return a list of all the ports we know about. */ struct parport *parport_enumerate(void) { +#ifdef CONFIG_KERNELD + if (portlist == NULL) + request_module("parport_lowlevel"); +#endif return portlist; } --- drivers/sound/sb_common.c +++ drivers/sound/sb_common.c 1997/08/12 07:03:07 @@ -663,7 +663,6 @@ sb_dsp_init (struct address_info *hw_config) { sb_devc *devc; - int n; char name[100]; extern int sb_be_quiet; @@ -735,6 +734,7 @@ devc->irq_ok = 1; else { + int n; for (n = 0; n < 3 && devc->irq_ok == 0; n++) if (sb_dsp_command (devc, 0xf2)) /* Cause interrupt immediately */ { --- fs/buffer.c +++ fs/buffer.c 1997/08/12 07:03:07 @@ -113,7 +113,7 @@ int bdflush_min[N_PARAM] = { 0, 10, 5, 25, 0, 100, 100, 1, 1}; int bdflush_max[N_PARAM] = {100,5000, 2000, 2000,100, 60000, 60000, 2047, 5}; -static void wakeup_bdflush(int); +void wakeup_bdflush(int); /* * Rewrote the wait-routines to use the "new" wait-queue functionality, @@ -1663,7 +1663,7 @@ static struct wait_queue * bdflush_done = NULL; struct task_struct *bdflush_tsk = 0; -static void wakeup_bdflush(int wait) +void wakeup_bdflush(int wait) { if (current == bdflush_tsk) return; --- include/linux/tty.h +++ include/linux/tty.h 1997/08/12 07:05:32 @@ -342,10 +342,6 @@ extern int pcxe_open(struct tty_struct *tty, struct file *filp); -/* epca.c */ - -extern int pc_open(struct tty_struct *tty, struct file *filp); - /* console.c */ extern void update_screen(int new_console);
| |