diff options
Diffstat (limited to 'arch/sparc/mm')
| -rw-r--r-- | arch/sparc/mm/io-unit.c | 4 | ||||
| -rw-r--r-- | arch/sparc/mm/iommu.c | 4 | ||||
| -rw-r--r-- | arch/sparc/mm/srmmu.c | 4 | ||||
| -rw-r--r-- | arch/sparc/mm/sun4c.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index 1679384d6..be4522e1f 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c @@ -1,4 +1,4 @@ -/* $Id: io-unit.c,v 1.22 2000/08/09 00:00:15 davem Exp $ +/* $Id: io-unit.c,v 1.23 2001/02/13 01:16:43 davem Exp $ * io-unit.c: IO-UNIT specific routines for memory management. * * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -7,7 +7,7 @@ #include <linux/config.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/spinlock.h> #include <asm/scatterlist.h> #include <asm/pgalloc.h> diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c index 058fdd0d1..3bd631f36 100644 --- a/arch/sparc/mm/iommu.c +++ b/arch/sparc/mm/iommu.c @@ -1,4 +1,4 @@ -/* $Id: iommu.c,v 1.20 2000/08/09 00:00:15 davem Exp $ +/* $Id: iommu.c,v 1.21 2001/02/13 01:16:43 davem Exp $ * iommu.c: IOMMU specific routines for memory management. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -11,7 +11,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/mm.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/scatterlist.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 0dba7d0a3..a5b2b117b 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -1,4 +1,4 @@ -/* $Id: srmmu.c,v 1.225 2000/11/30 08:37:31 anton Exp $ +/* $Id: srmmu.c,v 1.226 2001/02/13 01:16:44 davem Exp $ * srmmu.c: SRMMU specific routines for memory management. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -11,7 +11,7 @@ #include <linux/config.h> #include <linux/kernel.h> #include <linux/mm.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/pagemap.h> #include <linux/init.h> diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index 1b32dd8ef..ef5157b05 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c @@ -353,7 +353,7 @@ void __init sun4c_probe_vac(void) break; default: - prom_printf("Cannot initialize VAC - wierd sun4 model idprom->id_machtype = %d", idprom->id_machtype); + prom_printf("Cannot initialize VAC - weird sun4 model idprom->id_machtype = %d", idprom->id_machtype); prom_halt(); }; } else { |