Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys in many device attach paths, allocate memory with M_WAIT...
details: https://anonhg.NetBSD.org/src/rev/0edf1ce90372
branches: trunk
changeset: 460943:0edf1ce90372
user: chs <chs%NetBSD.org@localhost>
date: Sun Nov 10 21:16:21 2019 +0000
description:
in many device attach paths, allocate memory with M_WAITOK instead of M_NOWAIT
and remove code to handle failures that can no longer happen.
diffstat:
sys/arch/acorn32/mainbus/fd.c | 10 +--
sys/arch/algor/algor/algor_p4032_intr.c | 9 +--
sys/arch/algor/algor/algor_p5064_intr.c | 9 +--
sys/arch/algor/algor/algor_p6032_intr.c | 9 +--
sys/arch/algor/pci/pcib.c | 9 +--
sys/arch/alpha/common/shared_intr.c | 20 +-----
sys/arch/alpha/pci/dwlpx_dma.c | 8 +-
sys/arch/alpha/tc/ioasic.c | 8 +-
sys/arch/alpha/tc/tc_3000_300.c | 8 +-
sys/arch/alpha/tc/tc_3000_500.c | 8 +-
sys/arch/alpha/tc/tc_dma_3000_500.c | 9 +--
sys/arch/amd64/amd64/netbsd32_machdep.c | 12 +---
sys/arch/amiga/dev/siop.c | 8 +-
sys/arch/amiga/dev/siop2.c | 8 +-
sys/arch/amigappc/amigappc/pic_amiga.c | 7 +-
sys/arch/arc/arc/p_dti_arcstation.c | 6 +-
sys/arch/arc/isa/isabus.c | 9 +--
sys/arch/arc/pci/necpb.c | 9 +--
sys/arch/arm/at91/at91cf.c | 13 +---
sys/arch/arm/at91/at91dbgu.c | 13 +---
sys/arch/arm/clps711x/clpscom.c | 10 +--
sys/arch/arm/ep93xx/ep93xx_intr.c | 9 +--
sys/arch/arm/ep93xx/epcom.c | 11 +---
sys/arch/arm/ep93xx/eppcic.c | 9 +--
sys/arch/arm/footbridge/footbridge_irqhandler.c | 12 +---
sys/arch/arm/footbridge/isa/isa_machdep.c | 9 +--
sys/arch/arm/gemini/gemini_ipi.c | 15 +-----
sys/arch/arm/gemini/gemini_lpchc.c | 16 +-----
sys/arch/arm/gemini/gemini_pci.c | 16 +-----
sys/arch/arm/imx/imx51_ipuv3.c | 11 +---
sys/arch/arm/imx/imxuart.c | 12 +---
sys/arch/arm/iomd/iomd_irqhandler.c | 9 +--
sys/arch/arm/iomd/iomdkbc.c | 16 +----
sys/arch/arm/ixp12x0/ixp12x0_com.c | 11 +---
sys/arch/arm/ixp12x0/ixp12x0_intr.c | 9 +--
sys/arch/arm/ofw/ofw_irqhandler.c | 9 +--
sys/arch/arm/omap/omap_gpio.c | 10 +--
sys/arch/arm/s3c2xx0/s3c2440_dma.c | 4 +-
sys/arch/arm/s3c2xx0/s3c2440_dma.h | 2 +-
sys/arch/arm/s3c2xx0/s3c2440_i2s.c | 28 +---------
sys/arch/arm/s3c2xx0/s3c2440_sdi.c | 6 +-
sys/arch/arm/s3c2xx0/s3c24x0_lcd.c | 11 +---
sys/arch/arm/s3c2xx0/s3c2800_pci.c | 9 +--
sys/arch/arm/s3c2xx0/sscom.c | 11 +---
sys/arch/arm/sa11x0/sa1111.c | 9 +--
sys/arch/arm/sa11x0/sa11x0_com.c | 10 +--
sys/arch/arm/sa11x0/sa11x0_irqhandler.c | 9 +--
sys/arch/arm/xilinx/zynq_uart.c | 12 +---
sys/arch/arm/xscale/becc_icu.c | 9 +--
sys/arch/arm/xscale/i80321_icu.c | 9 +--
sys/arch/arm/xscale/ixp425_if_npe.c | 16 +-----
sys/arch/arm/xscale/ixp425_intr.c | 9 +--
sys/arch/arm/xscale/ixp425_qmgr.c | 9 +--
sys/arch/arm/xscale/pxa2x0_gpio.c | 7 +-
sys/arch/arm/xscale/pxa2x0_lcd.c | 11 +---
sys/arch/arm/zynq/zynq_uart.c | 12 +---
sys/arch/atari/atari/be_bus.c | 7 +-
sys/arch/atari/atari/intr.c | 12 +---
sys/arch/atari/atari/le_bus.c | 7 +-
sys/arch/atari/atari/mainbus.c | 9 +--
sys/arch/atari/dev/hdfd.c | 9 +--
sys/arch/bebox/bebox/mainbus.c | 10 +--
sys/arch/bebox/bebox/pic_bebox.c | 8 +-
sys/arch/cesfic/cesfic/isr.c | 10 +--
sys/arch/cesfic/dev/zs.c | 6 +-
sys/arch/cobalt/cobalt/interrupt.c | 9 +--
sys/arch/epoc32/windermere/wmcom.c | 10 +--
sys/arch/evbarm/dev/plcom.c | 11 +---
sys/arch/evbarm/ifpga/ifpga_intr.c | 7 +-
sys/arch/evbarm/iq80310/iq80310_intr.c | 9 +--
sys/arch/evbarm/mini2440/mini2440_machdep.c | 6 +-
sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c | 8 +-
sys/arch/evbmips/gdium/gdium_intr.c | 9 +--
sys/arch/evbmips/loongson/loongson_intr.c | 9 +--
sys/arch/evbmips/malta/malta_intr.c | 9 +--
sys/arch/evbmips/malta/pci/pcib.c | 9 +--
sys/arch/evbppc/pmppc/dev/cpc_mainbus.c | 9 +-
sys/arch/evbppc/pmppc/pic_cpc700.c | 7 +-
sys/arch/evbppc/virtex/design_gsrd1.c | 10 +--
sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4_intr.c | 8 +-
sys/arch/ews4800mips/sbd/fb_sbdio.c | 17 +-----
sys/arch/hp300/dev/hpib.c | 10 +--
sys/arch/hp300/hp300/autoconf.c | 9 +--
sys/arch/hp300/hp300/intr.c | 10 +--
sys/arch/hpc/hpc/config_hook.c | 14 +---
sys/arch/hpcarm/dev/wzero3_kbd.c | 16 +----
sys/arch/hpcarm/hpcarm/softintr.c | 9 +--
sys/arch/hpcmips/dev/plum.c | 11 +--
sys/arch/hpcmips/dev/plumiobus.c | 9 +--
sys/arch/hpcmips/tx/tx39icu.c | 21 ++-----
sys/arch/hpcmips/vr/flash_vrip.c | 15 +----
sys/arch/hpcmips/vr/vr4181giu.c | 8 +-
sys/arch/hpcmips/vr/vrc4172gpio.c | 9 +--
sys/arch/hpcmips/vr/vrgiu.c | 8 +-
sys/arch/hppa/dev/apic.c | 22 +------
sys/arch/i386/i386/mtrr_k6.c | 8 +-
sys/arch/i386/isa/ahc_isa.c | 10 +--
sys/arch/i386/pci/pci_intr_fixup.c | 11 +---
sys/arch/i386/pci/pcibios.c | 28 +++-------
sys/arch/i386/pnpbios/pnpbios.c | 26 ++++-----
sys/arch/ia64/ia64/interrupt.c | 12 +---
sys/arch/ibmnws/ibmnws/mainbus.c | 5 +-
sys/arch/landisk/landisk/intr.c | 8 +-
sys/arch/luna68k/luna68k/isr.c | 11 +---
sys/arch/mac68k/dev/grf_compat.c | 14 +---
sys/arch/macppc/dev/if_bm.c | 13 +---
sys/arch/macppc/dev/if_gm.c | 22 +++-----
sys/arch/macppc/dev/smu.c | 2 +-
sys/arch/macppc/macppc/memory.c | 12 +---
sys/arch/mips/adm5120/adm5120_intr.c | 9 +--
sys/arch/mips/alchemy/au_himem_space.c | 7 +-
sys/arch/mips/alchemy/au_icu.c | 9 +--
sys/arch/mips/alchemy/au_wired_space.c | 7 +-
sys/arch/mips/atheros/ar_intr.c | 13 +---
sys/arch/mips/atheros/dev/athflash.c | 10 +--
sys/arch/mips/cavium/dev/octeon_gmx.c | 6 +-
sys/arch/mips/cavium/dev/octeon_pow.c | 10 +--
sys/arch/mips/ralink/ralink_intr.c | 10 +--
sys/arch/mips/rmi/rmixl_pcie.c | 17 +-----
sys/arch/mips/rmi/rmixl_pcix.c | 17 +-----
sys/arch/mips/sibyte/dev/sbjcn.c | 12 +---
sys/arch/mips/sibyte/dev/sbscn.c | 12 +---
sys/arch/mipsco/isa/isa_machdep.c | 9 +--
sys/arch/mvme68k/mvme68k/isr.c | 10 +--
sys/arch/mvmeppc/mvmeppc/mainbus.c | 10 +--
sys/arch/news68k/news68k/isr.c | 11 +---
sys/arch/newsmips/apbus/apbus.c | 20 +++----
sys/arch/newsmips/dev/hb.c | 9 +--
sys/arch/next68k/dev/if_xe.c | 10 +--
sys/arch/next68k/next68k/isr.c | 11 +---
sys/arch/ofppc/pci/gt_mainbus.c | 7 +-
sys/arch/ofppc/pci/ofwpci.c | 7 +-
sys/arch/playstation2/dev/if_smap.c | 19 +-----
sys/arch/pmax/tc/dt.c | 11 +---
sys/arch/prep/pci/gten.c | 10 +--
sys/arch/prep/pci/pci_machdep.c | 7 +-
sys/arch/prep/pnpbus/nvram_pnpbus.c | 6 +-
sys/arch/prep/pnpbus/pnpbus.c | 20 +++---
sys/arch/prep/prep/mainbus.c | 10 +--
sys/arch/rs6000/rs6000/pic_iocc.c | 8 +-
sys/arch/sgimips/dev/int.c | 18 +-----
sys/arch/sh3/dev/sci.c | 11 +---
sys/arch/sh3/dev/scif.c | 10 +--
sys/arch/shark/isa/isa_irqhandler.c | 9 +--
sys/arch/shark/isa/isa_shark_machdep.c | 9 +--
sys/arch/shark/ofw/if_cs_ofisa_machdep.c | 8 +-
sys/arch/shark/ofw/igsfb_ofbus.c | 8 +-
sys/arch/shark/shark/profile.c | 19 +-----
sys/arch/sparc/dev/ebus.c | 12 +---
sys/arch/sparc/dev/fd.c | 9 +--
sys/arch/sparc/dev/rtc.c | 7 +-
sys/arch/sparc/dev/sbus.c | 15 +----
sys/arch/sparc/dev/sw.c | 8 +-
sys/arch/sparc/dev/vme_machdep.c | 11 +--
sys/arch/sparc/sparc/machdep.c | 14 +---
sys/arch/sparc/sparc/msiiep.c | 9 +--
sys/arch/sparc64/dev/cbus.c | 7 +-
sys/arch/sparc64/dev/central.c | 14 +---
sys/arch/sparc64/dev/ebus.c | 11 +---
sys/arch/sparc64/dev/ebus_mainbus.c | 9 +--
sys/arch/sparc64/dev/fdc.c | 9 +--
sys/arch/sparc64/dev/fhc.c | 14 +---
sys/arch/sparc64/dev/psycho.c | 39 +++-----------
sys/arch/sparc64/dev/pyro.c | 30 +++--------
sys/arch/sparc64/dev/sbus.c | 19 +-----
sys/arch/sparc64/dev/upa.c | 7 +-
sys/arch/sparc64/dev/vbus.c | 11 +---
sys/arch/sparc64/dev/vpci.c | 30 +++--------
sys/arch/sparc64/dev/vrtc.c | 7 +-
sys/arch/sparc64/sparc64/machdep.c | 8 +-
sys/arch/sun3/dev/eeprom.c | 8 +-
sys/arch/sun3/dev/fd.c | 9 +--
sys/arch/sun3/dev/xd.c | 8 +-
sys/arch/sun3/dev/xy.c | 8 +-
sys/arch/sun68k/sun68k/isr.c | 9 +--
sys/arch/sun68k/sun68k/vme_sun68k.c | 6 +-
sys/arch/vax/uba/qvkbd.c | 5 +-
sys/arch/vax/vax/multicpu.c | 14 +---
sys/arch/vax/vax/pmap.c | 6 +-
sys/arch/x68k/dev/fd.c | 9 +--
sys/arch/x68k/dev/intio.c | 8 +-
sys/arch/x68k/dev/neptune.c | 8 +-
sys/arch/x68k/dev/opmbell.c | 11 +---
sys/arch/x86/x86/sys_machdep.c | 9 +--
sys/arch/x86/x86/x86_autoconf.c | 9 +--
sys/arch/xen/xen/xengnt.c | 8 +-
sys/arch/xen/xenbus/xenbus_client.c | 10 +--
sys/arch/zaurus/dev/w100.c | 11 +---
sys/arch/zaurus/dev/zkbd.c | 11 +--
sys/dev/acpi/acpi_pci_link.c | 9 +--
sys/dev/bio.c | 8 +-
sys/dev/cardbus/ahc_cardbus.c | 9 +--
sys/dev/cardbus/cardbus.c | 11 +--
sys/dev/cardbus/cardbus_exrom.c | 10 +--
sys/dev/cardbus/sdhc_cardbus.c | 10 +--
sys/dev/dec/dzkbd.c | 7 +-
sys/dev/gpib/gpib.c | 11 +---
sys/dev/i2o/iop.c | 48 ++++--------------
sys/dev/i2o/iopsp.c | 6 +-
sys/dev/ic/aac.c | 17 +-----
sys/dev/ic/aic79xx.c | 14 +---
sys/dev/ic/aic79xx_osm.c | 11 +---
sys/dev/ic/aic7xxx.c | 24 ++------
sys/dev/ic/aic7xxx_osm.c | 8 +-
sys/dev/ic/arn5008.c | 12 +---
sys/dev/ic/arn9003.c | 17 +----
sys/dev/ic/ath.c | 31 ++---------
sys/dev/ic/athrate-amrr.c | 8 +-
sys/dev/ic/athrate-onoe.c | 8 +-
sys/dev/ic/athrate-sample.c | 8 +-
sys/dev/ic/atw.c | 13 +---
sys/dev/ic/cac.c | 11 +---
sys/dev/ic/ciss.c | 24 ++-------
sys/dev/ic/clmpcc.c | 12 +---
sys/dev/ic/com.c | 11 +---
sys/dev/ic/cs4231.c | 13 ++--
sys/dev/ic/cy.c | 13 +---
sys/dev/ic/i82586.c | 11 +---
sys/dev/ic/icp.c | 10 +--
sys/dev/ic/iha.c | 11 +---
sys/dev/ic/malo.c | 19 +-----
sys/dev/ic/mfi.c | 15 +----
sys/dev/ic/mlx.c | 6 +-
sys/dev/ic/mvsata.c | 28 +---------
sys/dev/ic/ncr53c9x.c | 16 +----
sys/dev/ic/oosiop.c | 13 +---
sys/dev/ic/osiop.c | 10 +--
sys/dev/ic/pckbc.c | 10 +--
sys/dev/ic/pdq.c | 8 +--
sys/dev/ic/pdqvar.h | 4 +-
sys/dev/ic/rt2560.c | 22 +------
sys/dev/ic/rt2661.c | 22 +------
sys/dev/ic/rtw.c | 17 +-----
sys/dev/ic/rtwphy.c | 18 +-----
sys/dev/ic/seeq8005.c | 10 +--
sys/dev/ic/siisata.c | 13 +---
sys/dev/ic/sti.c | 29 ++---------
sys/dev/ic/tulip.c | 6 +-
sys/dev/ic/vga.c | 10 +--
sys/dev/ic/vga_raster.c | 11 +---
sys/dev/ic/z8530tty.c | 11 +---
sys/dev/ieee1394/firewire.c | 61 +++++------------------
sys/dev/ieee1394/sbp.c | 19 +-----
sys/dev/isa/elink.c | 9 +--
sys/dev/isa/fd.c | 9 +--
sys/dev/isa/if_ef.c | 12 +---
sys/dev/isa/if_ep_isa.c | 10 +--
sys/dev/isa/if_trtcm_isa.c | 12 +---
sys/dev/isapnp/isapnp.c | 9 +--
sys/dev/marvell/mvpex.c | 9 +--
sys/dev/mvme/mvmebus.c | 9 +--
sys/dev/mvme/vme_two_isr.c | 8 +-
sys/dev/pci/agp.c | 8 +-
sys/dev/pci/agp_ali.c | 10 +--
sys/dev/pci/agp_amd.c | 15 +----
sys/dev/pci/agp_amd64.c | 11 +---
sys/dev/pci/agp_apple.c | 10 +--
sys/dev/pci/agp_i810.c | 21 +------
sys/dev/pci/agp_intel.c | 11 +---
sys/dev/pci/agp_sis.c | 10 +--
sys/dev/pci/agp_via.c | 10 +--
sys/dev/pci/ahc_pci.c | 19 +-----
sys/dev/pci/ahd_pci.c | 18 +-----
sys/dev/pci/amr.c | 9 +-
sys/dev/pci/btvmei.c | 11 +--
sys/dev/pci/btvmeii.c | 9 +--
sys/dev/pci/if_bge.c | 12 +---
sys/dev/pci/if_bnx.c | 15 +---
sys/dev/pci/if_de.c | 17 +----
sys/dev/pci/if_dge.c | 10 +--
sys/dev/pci/if_ena.c | 12 +---
sys/dev/pci/if_fpa.c | 8 +-
sys/dev/pci/if_iwi.c | 19 +-----
sys/dev/pci/if_msk.c | 12 +---
sys/dev/pci/if_sk.c | 33 ++----------
sys/dev/pci/if_ti.c | 13 +---
sys/dev/pci/if_tlp_pci.c | 10 +-
sys/dev/pci/if_txp.c | 9 +--
sys/dev/pci/if_wpi.c | 11 +---
sys/dev/pci/igsfb_pci.c | 8 +-
sys/dev/pci/ips.c | 9 +--
sys/dev/pci/isp_pci.c | 20 +------
sys/dev/pci/ixgbe/ix_txrx.c | 46 +++--------------
sys/dev/pci/ixgbe/ixgbe.c | 9 +--
sys/dev/pci/jmide.c | 10 +--
sys/dev/pci/mfii.c | 17 +----
sys/dev/pci/mly.c | 6 +-
sys/dev/pci/mpii.c | 48 +++---------------
sys/dev/pci/pccbb.c | 10 +--
sys/dev/pci/sdhc_pci.c | 10 +--
sys/dev/pci/trm.c | 10 +--
sys/dev/pci/twa.c | 24 +++------
sys/dev/pci/twe.c | 21 ++-----
sys/dev/pci/ubsec.c | 12 +---
sys/dev/pckbport/pckbport.c | 13 +---
sys/dev/pcmcia/if_malo_pcmcia.c | 8 +-
sys/dev/pcmcia/pcmcia_cis.c | 13 +---
sys/dev/pcmcia/pcmcia_cis_quirks.c | 14 +---
sys/dev/ppbus/if_plip.c | 20 +-----
sys/dev/qbus/uba.c | 8 +-
sys/dev/raidframe/rf_netbsdkintf.c | 57 +++------------------
sys/dev/sbus/bpp.c | 6 +-
sys/dev/sbus/esp_sbus.c | 18 +-----
sys/dev/sbus/magma.c | 8 +-
sys/dev/sbus/spif.c | 9 +--
sys/dev/sbus/zx.c | 6 +-
sys/dev/scsipi/atapi_wdc.c | 12 +---
sys/dev/scsipi/if_se.c | 19 +-----
sys/dev/scsipi/scsiconf.c | 14 +----
sys/dev/scsipi/scsipi_base.c | 18 +-----
sys/dev/scsipi/st.c | 9 +--
sys/dev/sdmmc/sbt.c | 10 +--
sys/dev/sun/fb.c | 39 +++++---------
sys/dev/sun/kbd.c | 7 +-
sys/dev/tc/cfb.c | 11 +---
sys/dev/tc/mfb.c | 12 +---
sys/dev/tc/px.c | 6 +-
sys/dev/tc/pxg.c | 6 +-
sys/dev/tc/sfb.c | 11 +---
sys/dev/tc/sfbplus.c | 12 +---
sys/dev/tc/stic.c | 6 +-
sys/dev/tc/tfb.c | 11 +---
sys/dev/tc/xcfb.c | 12 +---
sys/dev/tc/zs_ioasic.c | 6 +-
sys/dev/tc/zskbd.c | 6 +-
sys/dev/usb/umass_scsipi.c | 12 +---
sys/dev/vme/sc_vme.c | 9 +--
sys/dev/vme/si.c | 9 +--
sys/dev/vme/xd.c | 11 +--
sys/dev/vme/xy.c | 11 +--
sys/dev/wscons/wsdisplay.c | 11 +---
sys/dev/wscons/wsemul_vt100.c | 18 +++---
sys/dev/wscons/wsmux.c | 22 +------
sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c | 14 +----
sys/fs/sysvbfs/bfs.c | 10 +-
sys/net/agr/if_agrether.c | 9 +--
sys/net/agr/if_agrsubr.c | 9 +--
sys/net80211/ieee80211_acl.c | 18 +-----
sys/net80211/ieee80211_ioctl.c | 9 +--
sys/net80211/ieee80211_node.c | 23 +-------
sys/netinet/ip_carp.c | 8 +-
341 files changed, 1234 insertions(+), 2920 deletions(-)
diffs (truncated from 12478 to 300 lines):
diff -r 59783453db89 -r 0edf1ce90372 sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c Sun Nov 10 21:07:39 2019 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c Sun Nov 10 21:16:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.60 2019/02/08 08:47:35 mrg Exp $ */
+/* $NetBSD: fd.c,v 1.61 2019/11/10 21:16:21 chs Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.60 2019/02/08 08:47:35 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.61 2019/11/10 21:16:21 chs Exp $");
#include "opt_ddb.h"
@@ -1398,11 +1398,7 @@
}
fd_formb = malloc(sizeof(struct ne7_fd_formb),
- M_TEMP, M_NOWAIT);
- if(fd_formb == 0)
- return ENOMEM;
-
-
+ M_TEMP, M_WAITOK);
fd_formb->head = form_cmd->head;
fd_formb->cyl = form_cmd->cylinder;
fd_formb->transfer_rate = fd->sc_type->rate;
diff -r 59783453db89 -r 0edf1ce90372 sys/arch/algor/algor/algor_p4032_intr.c
--- a/sys/arch/algor/algor/algor_p4032_intr.c Sun Nov 10 21:07:39 2019 +0000
+++ b/sys/arch/algor/algor/algor_p4032_intr.c Sun Nov 10 21:16:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032_intr.c,v 1.25 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: algor_p4032_intr.c,v 1.26 2019/11/10 21:16:21 chs Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.25 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.26 2019/11/10 21:16:21 chs Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -352,10 +352,7 @@
KASSERT(irq == irqmap->irqidx);
- ih = malloc(sizeof(*ih), M_DEVBUF, M_NOWAIT);
- if (ih == NULL)
- return (NULL);
-
+ ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK);
ih->ih_func = func;
ih->ih_arg = arg;
ih->ih_irq = 0;
diff -r 59783453db89 -r 0edf1ce90372 sys/arch/algor/algor/algor_p5064_intr.c
--- a/sys/arch/algor/algor/algor_p5064_intr.c Sun Nov 10 21:07:39 2019 +0000
+++ b/sys/arch/algor/algor/algor_p5064_intr.c Sun Nov 10 21:16:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p5064_intr.c,v 1.28 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: algor_p5064_intr.c,v 1.29 2019/11/10 21:16:21 chs Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.28 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.29 2019/11/10 21:16:21 chs Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -445,10 +445,7 @@
KASSERT(irq == irqmap->irqidx);
- ih = malloc(sizeof(*ih), M_DEVBUF, M_NOWAIT);
- if (ih == NULL)
- return (NULL);
-
+ ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK);
ih->ih_func = func;
ih->ih_arg = arg;
ih->ih_irq = 0;
diff -r 59783453db89 -r 0edf1ce90372 sys/arch/algor/algor/algor_p6032_intr.c
--- a/sys/arch/algor/algor/algor_p6032_intr.c Sun Nov 10 21:07:39 2019 +0000
+++ b/sys/arch/algor/algor/algor_p6032_intr.c Sun Nov 10 21:16:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p6032_intr.c,v 1.22 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: algor_p6032_intr.c,v 1.23 2019/11/10 21:16:21 chs Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.22 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.23 2019/11/10 21:16:21 chs Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -313,10 +313,7 @@
KASSERT(irq == irqmap->irqidx);
- ih = malloc(sizeof(*ih), M_DEVBUF, M_NOWAIT);
- if (ih == NULL)
- return (NULL);
-
+ ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK);
ih->ih_func = func;
ih->ih_arg = arg;
ih->ih_irq = 0;
diff -r 59783453db89 -r 0edf1ce90372 sys/arch/algor/pci/pcib.c
--- a/sys/arch/algor/pci/pcib.c Sun Nov 10 21:07:39 2019 +0000
+++ b/sys/arch/algor/pci/pcib.c Sun Nov 10 21:16:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.24 2011/07/09 16:03:01 matt Exp $ */
+/* $NetBSD: pcib.c,v 1.25 2019/11/10 21:16:22 chs Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.24 2011/07/09 16:03:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.25 2019/11/10 21:16:22 chs Exp $");
#include "opt_algor_p5064.h"
#include "opt_algor_p6032.h"
@@ -449,10 +449,7 @@
return (NULL);
}
- ih = malloc(sizeof(*ih), M_DEVBUF, M_NOWAIT);
- if (ih == NULL)
- return (NULL);
-
+ ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK);
ih->ih_func = func;
ih->ih_arg = arg;
ih->ih_irq = irq;
diff -r 59783453db89 -r 0edf1ce90372 sys/arch/alpha/common/shared_intr.c
--- a/sys/arch/alpha/common/shared_intr.c Sun Nov 10 21:07:39 2019 +0000
+++ b/sys/arch/alpha/common/shared_intr.c Sun Nov 10 21:16:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: shared_intr.c,v 1.21 2012/02/06 02:14:12 matt Exp $ */
+/* $NetBSD: shared_intr.c,v 1.22 2019/11/10 21:16:22 chs Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.21 2012/02/06 02:14:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.22 2019/11/10 21:16:22 chs Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -72,10 +72,7 @@
unsigned int i;
intr = malloc(n * sizeof (struct alpha_shared_intr), M_DEVBUF,
- cold ? M_NOWAIT : M_WAITOK);
- if (intr == NULL)
- panic("alpha_shared_intr_alloc: couldn't malloc intr");
-
+ M_WAITOK);
for (i = 0; i < n; i++) {
TAILQ_INIT(&intr[i].intr_q);
intr[i].intr_sharetype = IST_NONE;
@@ -85,10 +82,7 @@
intr[i].intr_private = NULL;
if (namesize != 0) {
intr[i].intr_string = malloc(namesize, M_DEVBUF,
- cold ? M_NOWAIT : M_WAITOK);
- if (intr[i].intr_string == NULL)
- panic("alpha_shared_intr_alloc: couldn't "
- "malloc intr string");
+ M_WAITOK);
} else
intr[i].intr_string = NULL;
}
@@ -136,11 +130,7 @@
return NULL;
}
- /* no point in sleeping unless someone can free memory. */
- ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK);
- if (ih == NULL)
- panic("alpha_shared_intr_establish: can't malloc intrhand");
-
+ ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK);
#ifdef DIAGNOSTIC
if (type == IST_NONE)
panic("alpha_shared_intr_establish: bogus type");
diff -r 59783453db89 -r 0edf1ce90372 sys/arch/alpha/pci/dwlpx_dma.c
--- a/sys/arch/alpha/pci/dwlpx_dma.c Sun Nov 10 21:07:39 2019 +0000
+++ b/sys/arch/alpha/pci/dwlpx_dma.c Sun Nov 10 21:16:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_dma.c,v 1.24 2014/03/21 16:39:29 christos Exp $ */
+/* $NetBSD: dwlpx_dma.c,v 1.25 2019/11/10 21:16:22 chs Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.24 2014/03/21 16:39:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.25 2019/11/10 21:16:22 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -210,9 +210,7 @@
* SGVA base: 0
*/
#define EXNAMELEN 16
- exname = malloc(EXNAMELEN, M_DEVBUF, M_NOWAIT);
- if (exname == NULL)
- panic("dwlpx_dma_init");
+ exname = malloc(EXNAMELEN, M_DEVBUF, M_WAITOK);
snprintf(exname, EXNAMELEN, "%s_sgmap_a",
device_xname(ccp->cc_sc->dwlpx_dev));
alpha_sgmap_init(t, &ccp->cc_sgmap, exname, DWLPx_SG_MAPPED_BASE,
diff -r 59783453db89 -r 0edf1ce90372 sys/arch/alpha/tc/ioasic.c
--- a/sys/arch/alpha/tc/ioasic.c Sun Nov 10 21:07:39 2019 +0000
+++ b/sys/arch/alpha/tc/ioasic.c Sun Nov 10 21:16:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasic.c,v 1.46 2014/03/26 08:09:06 christos Exp $ */
+/* $NetBSD: ioasic.c,v 1.47 2019/11/10 21:16:22 chs Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.46 2014/03/26 08:09:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.47 2019/11/10 21:16:22 chs Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -196,9 +196,7 @@
ioasicintrs[i].iai_func = ioasic_intrnull;
ioasicintrs[i].iai_arg = (void *)i;
- cp = malloc(len, M_DEVBUF, M_NOWAIT);
- if (cp == NULL)
- panic("ioasicattach");
+ cp = malloc(len, M_DEVBUF, M_WAITOK);
snprintf(cp, len, "slot %lu", i);
evcnt_attach_dynamic(&ioasicintrs[i].iai_evcnt,
EVCNT_TYPE_INTR, pevcnt, device_xname(self), cp);
diff -r 59783453db89 -r 0edf1ce90372 sys/arch/alpha/tc/tc_3000_300.c
--- a/sys/arch/alpha/tc/tc_3000_300.c Sun Nov 10 21:07:39 2019 +0000
+++ b/sys/arch/alpha/tc/tc_3000_300.c Sun Nov 10 21:16:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_300.c,v 1.33 2014/03/26 08:09:06 christos Exp $ */
+/* $NetBSD: tc_3000_300.c,v 1.34 2019/11/10 21:16:22 chs Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.33 2014/03/26 08:09:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.34 2019/11/10 21:16:22 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,9 +111,7 @@
tc_3000_300_intr[i].tci_func = tc_3000_300_intrnull;
tc_3000_300_intr[i].tci_arg = (void *)i;
- cp = malloc(len, M_DEVBUF, M_NOWAIT);
- if (cp == NULL)
- panic("tc_3000_300_intr_setup");
+ cp = malloc(len, M_DEVBUF, M_WAITOK);
snprintf(cp, len, "slot %lu", i);
evcnt_attach_dynamic(&tc_3000_300_intr[i].tci_evcnt,
EVCNT_TYPE_INTR, NULL, "tc", cp);
diff -r 59783453db89 -r 0edf1ce90372 sys/arch/alpha/tc/tc_3000_500.c
--- a/sys/arch/alpha/tc/tc_3000_500.c Sun Nov 10 21:07:39 2019 +0000
+++ b/sys/arch/alpha/tc/tc_3000_500.c Sun Nov 10 21:16:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_500.c,v 1.32 2014/03/26 08:09:06 christos Exp $ */
+/* $NetBSD: tc_3000_500.c,v 1.33 2019/11/10 21:16:22 chs Exp $ */
Home |
Main Index |
Thread Index |
Old Index