diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /arch/m68k/atari | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'arch/m68k/atari')
| -rw-r--r-- | arch/m68k/atari/hades-pci.c | 4 | ||||
| -rw-r--r-- | arch/m68k/atari/stram.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/m68k/atari/hades-pci.c b/arch/m68k/atari/hades-pci.c index 2c82e4a7b..6d8ec7333 100644 --- a/arch/m68k/atari/hades-pci.c +++ b/arch/m68k/atari/hades-pci.c @@ -17,7 +17,7 @@ #if defined(CONFIG_PCI) && defined(CONFIG_HADES) -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/pci.h> @@ -372,6 +372,8 @@ struct pci_bus_info * __init init_hades_pci(void) */ bus = kmalloc(sizeof(struct pci_bus_info), GFP_KERNEL); + if (!bus) + return NULL; memset(bus, 0, sizeof(struct pci_bus_info)); /* diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c index b4a797f2e..b7b7b9553 100644 --- a/arch/m68k/atari/stram.c +++ b/arch/m68k/atari/stram.c @@ -16,7 +16,7 @@ #include <linux/major.h> #include <linux/init.h> #include <linux/swap.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/pagemap.h> #include <linux/shm.h> |