Linux-kernel mailing list archive 1999-32,: PATCH: misc fixes for 2.3.13

# PATCH: misc fixes for 2.3.13

Mikael Pettersson (mikpe@csd.uu.se)
Wed, 11 Aug 1999 14:48:28 +0200 (MET DST)

- Messages sorted by: [ date ][ thread ][ subject ][ author ]
- Next message: Steffen Zahn: "2.3.13: compile error in ncr53c8xx.c"
- Previous message: Jonathan Masters: "Unmounting"

Here is a set of small patches which fix a couple
of problems and ugly spots in kernel 2.3.13:

- fs/exec.c: missing "goto fail;" in do_coredump().
[Reported by Benjamin Redelings and Jeff Garzik several
weeks ago, but the fix never made it into 2.3.12 or 2.3.13.]

- drivers/block/floppy.c: unused variable "ints[]".

- drivers/char/ftape/lowlevel/ftape-setup.c: updated to use
the new __setup() mechanism.

- drivers/pci/{pci.c,Makefile}: fix to make pci link properly
when building a non-modular kernel.

- drivers/parport/parport_pc.c: fix typo introduced in 2.3.10.
[Reported by Vladimir Chernyshov.]

- arch/i386/kernel/apm.c: remove bogus "asmlinkage" in struct decl.
This triggers a warning from gcc versions newer than 2.7.x.

- arch/i386/Makefile: vmlinux.lds is a temporary file generated from
vmlinux.lds.S, so archmrproper should remove it.

/Mikael

--- linux-2.3.13/fs/exec.c.orig Tue Aug 10 23:49:09 1999
+++ linux-2.3.13/fs/exec.c Wed Aug 11 14:10:56 1999
@@ -811,6 +811,7 @@
if (!binfmt || !binfmt->core_dump)
goto fail;
if (!current->dumpable || atomic_read(&current->mm->mm_users) != 1)
+ goto fail;
current->dumpable = 0;
if (current->rlim[RLIMIT_CORE].rlim_cur < binfmt->min_coredump)
goto fail;
--- linux-2.3.13/drivers/block/floppy.c.orig Tue Aug 10 23:48:57 1999
+++ linux-2.3.13/drivers/block/floppy.c Wed Aug 11 14:10:56 1999
@@ -4365,7 +4365,6 @@
static void __init parse_floppy_cfg_string(char *cfg)
{
char *ptr;
- int ints[11];
while(*cfg) {
for(ptr = cfg;*cfg && *cfg != ' ' && *cfg != '\t'; cfg++);
--- linux-2.3.13/drivers/char/ftape/lowlevel/ftape-setup.c.orig Fri Jul 9 14:27:58 1999
+++ linux-2.3.13/drivers/char/ftape/lowlevel/ftape-setup.c Wed Aug 11 14:10:56 1999
@@ -60,12 +60,15 @@
{ "mach2", &ft_mach2, CONFIG_FT_MACH2, 0, 1}
};
-void __init ftape_setup(char *str, int *ints)
+static int __init ftape_setup(char *str)
{
int i;
int param;
+ int ints[2];
+
TRACE_FUN(ft_t_flow);
+ str = get_options(str, ARRAY_SIZE(ints), ints);
if (str) {
for (i=0; i < NR_ITEMS(config_params); i++) {
if (strcmp(str,config_params[i].name) == 0){
@@ -81,13 +84,13 @@
config_params[i].name,
config_params[i].min,
config_params[i].max);
- TRACE_EXIT;
+ goto out;
}
if(config_params[i].var) {
TRACE(ft_t_info, "%s=%d", str, param);
*config_params[i].var = param;
}
- TRACE_EXIT;
+ goto out;
}
}
}
@@ -101,5 +104,8 @@
} else {
TRACE(ft_t_err, "botched ftape option");
}
- TRACE_EXIT;
+ out:
+ TRACE_EXIT 1;
}
+
+__setup("ftape=", ftape_setup);
--- linux-2.3.13/drivers/pci/pci.c.orig Tue Aug 10 23:49:03 1999
+++ linux-2.3.13/drivers/pci/pci.c Wed Aug 11 14:10:56 1999
@@ -197,6 +197,7 @@
}
}
+extern void pci_namedevice(struct pci_dev *);
unsigned int __init pci_scan_bus(struct pci_bus *bus)
{
--- linux-2.3.13/drivers/pci/Makefile.orig Tue Aug 10 23:49:03 1999
+++ linux-2.3.13/drivers/pci/Makefile Wed Aug 11 14:10:56 1999
@@ -18,7 +18,7 @@
O_OBJS = pci.o names.o
L_OBJS := pci_syms.o
else
-L_OBJS := pci.o
+L_OBJS := pci.o names.o
endif
ifdef CONFIG_PROC_FS
--- linux-2.3.13/drivers/parport/parport_pc.c.orig Tue Aug 10 23:49:03 1999
+++ linux-2.3.13/drivers/parport/parport_pc.c Wed Aug 11 14:10:56 1999
@@ -1879,7 +1879,7 @@
if (p->irq != PARPORT_IRQ_NONE)
free_irq(p->irq, p);
release_region(p->base, 3);
- if (p->size > 3);
+ if (p->size > 3)
release_region(p->base + 3, p->size - 3);
if (p->modes & PARPORT_MODE_ECP)
release_region(p->base_hi, 3);
--- linux-2.3.13/arch/i386/kernel/apm.c.orig Tue Aug 10 23:48:36 1999
+++ linux-2.3.13/arch/i386/kernel/apm.c Wed Aug 11 14:10:56 1999
@@ -288,7 +288,7 @@
/*
* Local variables
*/
-static asmlinkage struct {
+static struct {
unsigned long offset;
unsigned short segment;
} apm_bios_entry;
--- linux-2.3.13/arch/i386/Makefile.orig Thu Jul 22 12:46:44 1999
+++ linux-2.3.13/arch/i386/Makefile Wed Aug 11 14:10:56 1999
@@ -111,6 +111,7 @@
@$(MAKEBOOT) clean
archmrproper:
+ rm -f arch/i386/vmlinux.lds
archdep:
@$(MAKEBOOT) dep

-
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/

- Next message: Steffen Zahn: "2.3.13: compile error in ncr53c8xx.c"
- Previous message: Jonathan Masters: "Unmounting"