Messages in this thread Patch in this message | | | Date | Tue, 21 Mar 2000 15:04:31 +0000 (GMT) | From | Tim Waugh <> | Subject | [patch] __setup returning 1 |
| |
Here is a patch to correct the return value of some __setup routines. These are the ones I'm fairly sure about; I have a short-list of other __setup routines that are a bit more complicated and still need checking.
Tim. */
Index: arch/arm/kernel/process.c =================================================================== RCS file: /usr/local/src/cvsroot/linux/arch/arm/kernel/process.c,v retrieving revision 1.1.1.7 diff -d -u -r1.1.1.7 process.c --- arch/arm/kernel/process.c 2000/03/19 11:39:50 1.1.1.7 +++ arch/arm/kernel/process.c 2000/03/21 14:57:26 @@ -89,7 +89,7 @@ int __init reboot_setup(char *str) { reboot_mode = str[0]; - return 0; + return 1; } __setup("reboot=", reboot_setup); Index: drivers/block/md.c =================================================================== RCS file: /usr/local/src/cvsroot/linux/drivers/block/md.c,v retrieving revision 1.1.1.13 diff -d -u -r1.1.1.13 md.c --- drivers/block/md.c 2000/02/24 09:29:54 1.1.1.13 +++ drivers/block/md.c 2000/03/21 14:57:35 @@ -3265,7 +3265,7 @@ md_setup_args.devices[minor][i] = (kdev_t) 0; md_setup_args.pers[minor] = level | factor | (fault << FAULT_SHIFT); md_setup_args.set |= (1 << minor); - return 0; + return 1; } #endif Index: drivers/parport/init.c =================================================================== RCS file: /usr/local/src/cvsroot/linux/drivers/parport/init.c,v retrieving revision 1.5 diff -d -u -r1.5 init.c --- drivers/parport/init.c 2000/01/28 09:35:14 1.5 +++ drivers/parport/init.c 2000/03/21 14:58:07 @@ -49,13 +49,13 @@ if (!str || !*str || (*str == '0' && !*(str+1))) { /* Disable parport if "parport=0" in cmdline */ io[0] = PARPORT_DISABLE; - return 0; + return 1; } if (!strncmp (str, "auto", 4)) { irq[0] = PARPORT_IRQ_AUTO; dma[0] = PARPORT_DMA_AUTO; - return 0; + return 1; } val = simple_strtoul (str, &endptr, 0); @@ -108,7 +108,7 @@ } parport_setup_ptr++; - return 0; + return 1; } __setup ("parport=", parport_setup); Index: drivers/scsi/eata.c =================================================================== RCS file: /usr/local/src/cvsroot/linux/drivers/scsi/eata.c,v retrieving revision 1.1.1.6 diff -d -u -r1.1.1.6 eata.c --- drivers/scsi/eata.c 2000/02/14 10:21:44 1.1.1.6 +++ drivers/scsi/eata.c 2000/03/21 14:58:46 @@ -1212,7 +1212,7 @@ ints[0] = i - 1; internal_setup(cur, ints); - return 0; + return 1; } static void add_pci_ports(void) { Index: drivers/scsi/wd33c93.c =================================================================== RCS file: /usr/local/src/cvsroot/linux/drivers/scsi/wd33c93.c,v retrieving revision 1.1.1.2 diff -d -u -r1.1.1.2 wd33c93.c --- drivers/scsi/wd33c93.c 1999/11/24 18:00:44 1.1.1.2 +++ drivers/scsi/wd33c93.c 2000/03/21 14:58:56 @@ -1638,7 +1638,7 @@ setup_used[i] = 0; done_setup = 1; - return 0; + return 1; } __setup("wd33c93", wd33c93_setup); Index: drivers/sound/aedsp16.c =================================================================== RCS file: /usr/local/src/cvsroot/linux/drivers/sound/aedsp16.c,v retrieving revision 1.1.1.1 diff -d -u -r1.1.1.1 aedsp16.c --- drivers/sound/aedsp16.c 2000/03/13 11:36:12 1.1.1.1 +++ drivers/sound/aedsp16.c 2000/03/21 14:59:20 @@ -1383,6 +1383,7 @@ mss_base = ints[4]; mpu_base = ints[5]; mpu_irq = ints[6]; + return 1; } __setup("aedsp16=", setup_aedsp16);
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
| |