Module Name: src Committed By: thorpej Date: Wed Dec 20 05:33:19 UTC 2023
Modified Files: src/sys/arch/sparc/dev: bwtwo_obio.c cgeight.c cgfour.c cgfourteen.c cgsix_obio.c cgtwo.c dma_obio.c if_ie_obio.c obio.c rtc.c sx.c ts102.c src/sys/arch/sparc/sparc: autoconf.c core_machdep.c pci_machdep.c Log Message: Remove unnecessary <sys/malloc.h>. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc/dev/bwtwo_obio.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/sparc/dev/cgeight.c \ src/sys/arch/sparc/dev/cgfour.c cvs rdiff -u -r1.95 -r1.96 src/sys/arch/sparc/dev/cgfourteen.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc/dev/cgsix_obio.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/sparc/dev/cgtwo.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/dev/dma_obio.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sparc/dev/if_ie_obio.c cvs rdiff -u -r1.76 -r1.77 src/sys/arch/sparc/dev/obio.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc/dev/rtc.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/dev/sx.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/dev/ts102.c cvs rdiff -u -r1.271 -r1.272 src/sys/arch/sparc/sparc/autoconf.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/sparc/core_machdep.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/sparc/pci_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/sparc/dev/bwtwo_obio.c diff -u src/sys/arch/sparc/dev/bwtwo_obio.c:1.17 src/sys/arch/sparc/dev/bwtwo_obio.c:1.18 --- src/sys/arch/sparc/dev/bwtwo_obio.c:1.17 Sat Sep 19 04:52:44 2009 +++ src/sys/arch/sparc/dev/bwtwo_obio.c Wed Dec 20 05:33:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: bwtwo_obio.c,v 1.17 2009/09/19 04:52:44 tsutsui Exp $ */ +/* $NetBSD: bwtwo_obio.c,v 1.18 2023/12/20 05:33:18 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -79,13 +79,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bwtwo_obio.c,v 1.17 2009/09/19 04:52:44 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bwtwo_obio.c,v 1.18 2023/12/20 05:33:18 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #include <sys/ioctl.h> -#include <sys/malloc.h> #include <sys/mman.h> #include <sys/tty.h> #include <sys/conf.h> Index: src/sys/arch/sparc/dev/cgeight.c diff -u src/sys/arch/sparc/dev/cgeight.c:1.50 src/sys/arch/sparc/dev/cgeight.c:1.51 --- src/sys/arch/sparc/dev/cgeight.c:1.50 Sat Oct 18 08:33:26 2014 +++ src/sys/arch/sparc/dev/cgeight.c Wed Dec 20 05:33:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cgeight.c,v 1.50 2014/10/18 08:33:26 snj Exp $ */ +/* $NetBSD: cgeight.c,v 1.51 2023/12/20 05:33:18 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -102,14 +102,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgeight.c,v 1.50 2014/10/18 08:33:26 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgeight.c,v 1.51 2023/12/20 05:33:18 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/buf.h> #include <sys/device.h> #include <sys/ioctl.h> -#include <sys/malloc.h> #include <sys/mman.h> #include <sys/tty.h> #include <sys/conf.h> Index: src/sys/arch/sparc/dev/cgfour.c diff -u src/sys/arch/sparc/dev/cgfour.c:1.50 src/sys/arch/sparc/dev/cgfour.c:1.51 --- src/sys/arch/sparc/dev/cgfour.c:1.50 Sat Oct 18 08:33:26 2014 +++ src/sys/arch/sparc/dev/cgfour.c Wed Dec 20 05:33:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cgfour.c,v 1.50 2014/10/18 08:33:26 snj Exp $ */ +/* $NetBSD: cgfour.c,v 1.51 2023/12/20 05:33:18 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -102,14 +102,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgfour.c,v 1.50 2014/10/18 08:33:26 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgfour.c,v 1.51 2023/12/20 05:33:18 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/buf.h> #include <sys/device.h> #include <sys/ioctl.h> -#include <sys/malloc.h> #include <sys/mman.h> #include <sys/tty.h> #include <sys/conf.h> Index: src/sys/arch/sparc/dev/cgfourteen.c diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.95 src/sys/arch/sparc/dev/cgfourteen.c:1.96 --- src/sys/arch/sparc/dev/cgfourteen.c:1.95 Tue Jun 13 10:11:17 2023 +++ src/sys/arch/sparc/dev/cgfourteen.c Wed Dec 20 05:33:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cgfourteen.c,v 1.95 2023/06/13 10:11:17 macallan Exp $ */ +/* $NetBSD: cgfourteen.c,v 1.96 2023/12/20 05:33:18 thorpej Exp $ */ /* * Copyright (c) 1996 @@ -67,7 +67,6 @@ #include <sys/buf.h> #include <sys/device.h> #include <sys/ioctl.h> -#include <sys/malloc.h> #include <sys/kmem.h> #include <sys/mman.h> #include <sys/tty.h> Index: src/sys/arch/sparc/dev/cgsix_obio.c diff -u src/sys/arch/sparc/dev/cgsix_obio.c:1.27 src/sys/arch/sparc/dev/cgsix_obio.c:1.28 --- src/sys/arch/sparc/dev/cgsix_obio.c:1.27 Thu Apr 21 17:59:18 2016 +++ src/sys/arch/sparc/dev/cgsix_obio.c Wed Dec 20 05:33:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cgsix_obio.c,v 1.27 2016/04/21 17:59:18 macallan Exp $ */ +/* $NetBSD: cgsix_obio.c,v 1.28 2023/12/20 05:33:18 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -34,14 +34,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.27 2016/04/21 17:59:18 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.28 2023/12/20 05:33:18 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/buf.h> #include <sys/device.h> #include <sys/ioctl.h> -#include <sys/malloc.h> #include <sys/mman.h> #include <sys/tty.h> #include <sys/conf.h> Index: src/sys/arch/sparc/dev/cgtwo.c diff -u src/sys/arch/sparc/dev/cgtwo.c:1.57 src/sys/arch/sparc/dev/cgtwo.c:1.58 --- src/sys/arch/sparc/dev/cgtwo.c:1.57 Fri Jul 25 08:10:34 2014 +++ src/sys/arch/sparc/dev/cgtwo.c Wed Dec 20 05:33:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cgtwo.c,v 1.57 2014/07/25 08:10:34 dholland Exp $ */ +/* $NetBSD: cgtwo.c,v 1.58 2023/12/20 05:33:18 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -49,14 +49,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgtwo.c,v 1.57 2014/07/25 08:10:34 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgtwo.c,v 1.58 2023/12/20 05:33:18 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/buf.h> #include <sys/device.h> #include <sys/ioctl.h> -#include <sys/malloc.h> #include <sys/mman.h> #include <sys/tty.h> #include <sys/conf.h> Index: src/sys/arch/sparc/dev/dma_obio.c diff -u src/sys/arch/sparc/dev/dma_obio.c:1.12 src/sys/arch/sparc/dev/dma_obio.c:1.13 --- src/sys/arch/sparc/dev/dma_obio.c:1.12 Fri Jul 1 18:50:41 2011 +++ src/sys/arch/sparc/dev/dma_obio.c Wed Dec 20 05:33:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: dma_obio.c,v 1.12 2011/07/01 18:50:41 dyoung Exp $ */ +/* $NetBSD: dma_obio.c,v 1.13 2023/12/20 05:33:18 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dma_obio.c,v 1.12 2011/07/01 18:50:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dma_obio.c,v 1.13 2023/12/20 05:33:18 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: dma_obio.c,v #include <sys/kernel.h> #include <sys/errno.h> #include <sys/device.h> -#include <sys/malloc.h> #include <sys/bus.h> #include <machine/autoconf.h> Index: src/sys/arch/sparc/dev/if_ie_obio.c diff -u src/sys/arch/sparc/dev/if_ie_obio.c:1.43 src/sys/arch/sparc/dev/if_ie_obio.c:1.44 --- src/sys/arch/sparc/dev/if_ie_obio.c:1.43 Sun Oct 24 20:00:11 2021 +++ src/sys/arch/sparc/dev/if_ie_obio.c Wed Dec 20 05:33:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ie_obio.c,v 1.43 2021/10/24 20:00:11 andvar Exp $ */ +/* $NetBSD: if_ie_obio.c,v 1.44 2023/12/20 05:33:18 thorpej Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -73,13 +73,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.43 2021/10/24 20:00:11 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.44 2023/12/20 05:33:18 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/errno.h> #include <sys/device.h> -#include <sys/malloc.h> #include <sys/protosw.h> #include <sys/socket.h> Index: src/sys/arch/sparc/dev/obio.c diff -u src/sys/arch/sparc/dev/obio.c:1.76 src/sys/arch/sparc/dev/obio.c:1.77 --- src/sys/arch/sparc/dev/obio.c:1.76 Sat Aug 7 16:19:05 2021 +++ src/sys/arch/sparc/dev/obio.c Wed Dec 20 05:33:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.76 2021/08/07 16:19:05 thorpej Exp $ */ +/* $NetBSD: obio.c,v 1.77 2023/12/20 05:33:18 thorpej Exp $ */ /*- * Copyright (c) 1997,1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.76 2021/08/07 16:19:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.77 2023/12/20 05:33:18 thorpej Exp $"); #include "locators.h" @@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.7 #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/malloc.h> #ifdef DEBUG #include <sys/proc.h> Index: src/sys/arch/sparc/dev/rtc.c diff -u src/sys/arch/sparc/dev/rtc.c:1.20 src/sys/arch/sparc/dev/rtc.c:1.21 --- src/sys/arch/sparc/dev/rtc.c:1.20 Thu Jan 2 22:32:20 2020 +++ src/sys/arch/sparc/dev/rtc.c Wed Dec 20 05:33:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: rtc.c,v 1.20 2020/01/02 22:32:20 thorpej Exp $ */ +/* $NetBSD: rtc.c,v 1.21 2023/12/20 05:33:18 thorpej Exp $ */ /* * Copyright (c) 2001 Valeriy E. Ushakov @@ -34,12 +34,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.20 2020/01/02 22:32:20 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.21 2023/12/20 05:33:18 thorpej Exp $"); #include <sys/param.h> #include <sys/kernel.h> #include <sys/device.h> -#include <sys/malloc.h> #include <sys/systm.h> #ifdef GPROF #include <sys/gmon.h> Index: src/sys/arch/sparc/dev/sx.c diff -u src/sys/arch/sparc/dev/sx.c:1.7 src/sys/arch/sparc/dev/sx.c:1.8 --- src/sys/arch/sparc/dev/sx.c:1.7 Tue Jun 13 10:09:31 2023 +++ src/sys/arch/sparc/dev/sx.c Wed Dec 20 05:33:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: sx.c,v 1.7 2023/06/13 10:09:31 macallan Exp $ */ +/* $NetBSD: sx.c,v 1.8 2023/12/20 05:33:18 thorpej Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,14 +30,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sx.c,v 1.7 2023/06/13 10:09:31 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sx.c,v 1.8 2023/12/20 05:33:18 thorpej Exp $"); #include "locators.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/malloc.h> #include <uvm/uvm_extern.h> Index: src/sys/arch/sparc/dev/ts102.c diff -u src/sys/arch/sparc/dev/ts102.c:1.21 src/sys/arch/sparc/dev/ts102.c:1.22 --- src/sys/arch/sparc/dev/ts102.c:1.21 Sat Aug 7 16:19:05 2021 +++ src/sys/arch/sparc/dev/ts102.c Wed Dec 20 05:33:18 2023 @@ -1,5 +1,5 @@ /* $OpenBSD: ts102.c,v 1.14 2005/01/27 17:03:23 millert Exp $ */ -/* $NetBSD: ts102.c,v 1.21 2021/08/07 16:19:05 thorpej Exp $ */ +/* $NetBSD: ts102.c,v 1.22 2023/12/20 05:33:18 thorpej Exp $ */ /* * Copyright (c) 2003, 2004, Miodrag Vallat. * Copyright (c) 2005, Michael Lorenz. @@ -66,7 +66,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/errno.h> -#include <sys/malloc.h> #include <sys/extent.h> #include <sys/proc.h> #include <sys/kernel.h> Index: src/sys/arch/sparc/sparc/autoconf.c diff -u src/sys/arch/sparc/sparc/autoconf.c:1.271 src/sys/arch/sparc/sparc/autoconf.c:1.272 --- src/sys/arch/sparc/sparc/autoconf.c:1.271 Fri Sep 30 14:32:45 2022 +++ src/sys/arch/sparc/sparc/autoconf.c Wed Dec 20 05:33:19 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.271 2022/09/30 14:32:45 jdc Exp $ */ +/* $NetBSD: autoconf.c,v 1.272 2023/12/20 05:33:19 thorpej Exp $ */ /* * Copyright (c) 1996 @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.271 2022/09/30 14:32:45 jdc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.272 2023/12/20 05:33:19 thorpej Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -70,7 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v #include <sys/conf.h> #include <sys/reboot.h> #include <sys/socket.h> -#include <sys/malloc.h> #include <sys/queue.h> #include <sys/msgbuf.h> #include <sys/boot_flag.h> Index: src/sys/arch/sparc/sparc/core_machdep.c diff -u src/sys/arch/sparc/sparc/core_machdep.c:1.8 src/sys/arch/sparc/sparc/core_machdep.c:1.9 --- src/sys/arch/sparc/sparc/core_machdep.c:1.8 Wed Nov 20 19:37:53 2019 +++ src/sys/arch/sparc/sparc/core_machdep.c Wed Dec 20 05:33:19 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: core_machdep.c,v 1.8 2019/11/20 19:37:53 pgoyette Exp $ */ +/* $NetBSD: core_machdep.c,v 1.9 2023/12/20 05:33:19 thorpej Exp $ */ /* * Copyright (c) 1996 @@ -49,13 +49,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.8 2019/11/20 19:37:53 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.9 2023/12/20 05:33:19 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> #include <sys/core.h> -#include <sys/malloc.h> #include <sys/buf.h> #include <sys/exec.h> #include <sys/vnode.h> Index: src/sys/arch/sparc/sparc/pci_machdep.c diff -u src/sys/arch/sparc/sparc/pci_machdep.c:1.21 src/sys/arch/sparc/sparc/pci_machdep.c:1.22 --- src/sys/arch/sparc/sparc/pci_machdep.c:1.21 Fri Oct 2 05:22:52 2015 +++ src/sys/arch/sparc/sparc/pci_machdep.c Wed Dec 20 05:33:19 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.21 2015/10/02 05:22:52 msaitoh Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.22 2023/12/20 05:33:19 thorpej Exp $ */ /* * Copyright (c) 1999, 2000 Matthew R. Green @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.21 2015/10/02 05:22:52 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.22 2023/12/20 05:33:19 thorpej Exp $"); #if defined(DEBUG) && !defined(SPARC_PCI_DEBUG) #define SPARC_PCI_DEBUG @@ -62,7 +62,6 @@ int sparc_pci_debug = 0; #include <sys/systm.h> #include <sys/errno.h> #include <sys/device.h> -#include <sys/malloc.h> #include <sys/bus.h> #include <machine/autoconf.h>