Permalink
Browse files

sync with head.

  • Loading branch information...
1 parent e78f60f commit c05e260d94b2712669eaafdb8e08d9bbf5e0e657 yamt committed Nov 29, 2005
Showing with 4,589 additions and 2,584 deletions.
  1. +5 −3 sys/arch/algor/algor/bus_dma.c
  2. +5 −3 sys/arch/alpha/common/bus_dma.c
  3. +3 −2 sys/arch/alpha/conf/GENERIC
  4. +4 −3 sys/arch/amd64/conf/GENERIC
  5. +8 −8 sys/arch/amd64/conf/INSTALL
  6. +10 −1 sys/arch/amd64/conf/Makefile.amd64
  7. +3 −3 sys/arch/amiga/dev/sci.c
  8. +5 −3 sys/arch/arc/arc/bus_dma.c
  9. +3 −3 sys/arch/arc/arc/bus_space_sparse.c
  10. +4 −3 sys/arch/arc/conf/GENERIC
  11. +1 −5 sys/arch/arc/conf/Makefile.arc.inc
  12. +5 −3 sys/arch/arm/arm32/bus_dma.c
  13. +4 −3 sys/arch/arm/ep93xx/ep93xx_space.c
  14. +4 −3 sys/arch/arm/footbridge/footbridge_io.c
  15. +4 −3 sys/arch/arm/ixp12x0/ixp12x0_io.c
  16. +4 −3 sys/arch/arm/mainbus/mainbus_io.c
  17. +4 −3 sys/arch/arm/s3c2xx0/s3c2800_pci.c
  18. +4 −3 sys/arch/arm/s3c2xx0/s3c2xx0_space.c
  19. +4 −3 sys/arch/arm/sa11x0/sa11x0_io.c
  20. +4 −3 sys/arch/arm/xscale/i80312_space.c
  21. +4 −3 sys/arch/arm/xscale/i80321_space.c
  22. +4 −3 sys/arch/arm/xscale/ixp425_pci_space.c
  23. +4 −3 sys/arch/arm/xscale/ixp425_space.c
  24. +4 −3 sys/arch/arm/xscale/pxa2x0_space.c
  25. +7 −4 sys/arch/atari/atari/bus.c
  26. +10 −9 sys/arch/bebox/bebox/clock.c
  27. +4 −3 sys/arch/bebox/conf/GENERIC
  28. +3 −2 sys/arch/cats/conf/GENERIC
  29. +1 −3 sys/arch/cats/conf/Makefile.cats.inc
  30. +5 −3 sys/arch/cobalt/cobalt/bus.c
  31. +4 −3 sys/arch/cobalt/conf/GENERIC
  32. +5 −4 sys/arch/cobalt/conf/INSTALL
  33. +1 −2 sys/arch/cobalt/stand/boot/boot.c
  34. +1 −5 sys/arch/dreamcast/conf/Makefile.dreamcast.inc
  35. +5 −3 sys/arch/dreamcast/dev/g2/gapspci_dma.c
  36. +4 −3 sys/arch/evbarm/adi_brh/obio_space.c
  37. +354 −0 sys/arch/evbarm/conf/ARMADILLO9
  38. +1 −5 sys/arch/evbarm/conf/Makefile.evbarm.inc
  39. +4 −3 sys/arch/evbarm/ifpga/ifpga_io.c
  40. +4 −3 sys/arch/evbarm/iq80310/obio_space.c
  41. +4 −3 sys/arch/evbarm/iq80321/obio_space.c
  42. +1 −3 sys/arch/evbmips/conf/Makefile.evbmips.inc
  43. +10 −16 sys/arch/evbmips/include/intr.h
  44. +3 −2 sys/arch/evbmips/malta/malta_intr.c
  45. +3 −2 sys/arch/evbmips/malta/pci/pchb.c
  46. +1 −7 sys/arch/evbppc/conf/Makefile.ev64260.inc
  47. +1 −7 sys/arch/evbppc/conf/Makefile.explora.inc
  48. +1 −7 sys/arch/evbppc/conf/Makefile.obs200.inc
  49. +1 −7 sys/arch/evbppc/conf/Makefile.obs405.inc
  50. +1 −7 sys/arch/evbppc/conf/Makefile.walnut.inc
  51. +9 −9 sys/arch/evbppc/ev64260/clock.c
  52. +5 −3 sys/arch/evbppc/evbppc/bus_dma.c
  53. +4 −3 sys/arch/evbsh3/evbsh3/machdep.c
  54. +8 −14 sys/arch/evbsh3/include/intr.h
  55. +4 −3 sys/arch/hp700/conf/GENERIC
  56. +5 −3 sys/arch/hp700/hp700/mainbus.c
  57. +8 −21 sys/arch/hp700/include/intr.h
  58. +5 −3 sys/arch/hpcmips/hpcmips/bus_dma.c
  59. +4 −3 sys/arch/i386/conf/GENERIC
  60. +4 −3 sys/arch/i386/conf/GENERIC.MPACPI
  61. +3 −2 sys/arch/i386/conf/VIRTUALPC
  62. +3 −2 sys/arch/i386/conf/XEN0
  63. +3 −2 sys/arch/i386/conf/XENU
  64. +9 −8 sys/arch/ibmnws/ibmnws/clock.c
  65. +4 −3 sys/arch/iyonix/iyonix/obio_space.c
  66. +5 −3 sys/arch/m68k/m68k/bus_dma.c
  67. +34 −27 sys/arch/mac68k/include/intr.h
  68. +4 −3 sys/arch/mac68k/mac68k/bus_space.c
  69. +3 −2 sys/arch/mac68k/mac68k/intr.c
  70. +4 −3 sys/arch/macppc/conf/GENERIC
  71. +1 −7 sys/arch/macppc/conf/Makefile.macppc
  72. +5 −3 sys/arch/macppc/macppc/bus_dma.c
  73. +3 −2 sys/arch/mips/alchemy/au_timer.c
  74. +9 −9 sys/arch/mips/include/pte.h
  75. +5 −3 sys/arch/mips/mips/bus_dma.c
  76. +5 −6 sys/arch/mips/mips/cache.c
  77. +4 −4 sys/arch/mips/mips/cache_r5900.c
  78. +3 −3 sys/arch/mips/mips/kgdb_machdep.c
  79. +5 −5 sys/arch/mips/mips/pmap.c
  80. +3 −3 sys/arch/mips/mips/wired_map.c
  81. +5 −3 sys/arch/mipsco/mipsco/bus_dma.c
  82. +5 −3 sys/arch/mvme68k/mvme68k/bus_dma.c
  83. +10 −9 sys/arch/mvmeppc/mvmeppc/clock.c
  84. +3 −2 sys/arch/netwinder/conf/GENERIC
  85. +1 −5 sys/arch/netwinder/conf/Makefile.netwinder.inc
  86. +5 −3 sys/arch/newsmips/newsmips/bus.c
  87. +10 −4 sys/arch/ofppc/firepower/firepower_intr.c
  88. +5 −3 sys/arch/ofppc/include/intr.h
  89. +6 −12 sys/arch/ofppc/ofppc/clock.c
  90. +11 −5 sys/arch/ofppc/ofppc/machdep.c
  91. +10 −4 sys/arch/ofppc/ofwgen/ofwgen_intr.c
  92. +5 −3 sys/arch/playstation2/playstation2/bus_dma.c
  93. +3 −3 sys/arch/pmax/dev/rcons.c
  94. +5 −3 sys/arch/pmax/pmax/bus_dma.c
  95. +1 −2 sys/arch/pmppc/conf/INSTALL
  96. +1 −2 sys/arch/pmppc/conf/std.pmppc
  97. +1 −7 sys/arch/powerpc/conf/Makefile.powerpc
  98. +13 −10 sys/arch/powerpc/ibm4xx/clock.c
  99. +8 −19 sys/arch/powerpc/include/ibm4xx/ibm4xx_intr.h
  100. +5 −3 sys/arch/powerpc/marvell/bus_dma.c
  101. +7 −23 sys/arch/powerpc/marvell/marvell_intr.h
  102. +5 −3 sys/arch/powerpc/powerpc/bus_dma.c
  103. +4 −3 sys/arch/prep/conf/GENERIC
  104. +10 −9 sys/arch/sandpoint/sandpoint/clock.c
  105. +0 −5 sys/arch/sbmips/conf/Makefile.sbmips.inc
  106. +5 −3 sys/arch/sgimips/conf/GENERIC32_IP3x
  107. +4 −4 sys/arch/sgimips/mace/mace.c
  108. +5 −3 sys/arch/sgimips/sgimips/bus.c
  109. +5 −3 sys/arch/sh5/sh5/bus_dma.c
  110. +4 −3 sys/arch/sh5/sh5/pmap.c
  111. +1 −3 sys/arch/shark/conf/Makefile.shark.inc
  112. +3 −4 sys/arch/sparc/conf/KRUPS
  113. +49 −2 sys/arch/sparc/dev/ebus.c
  114. +5 −3 sys/arch/sparc/sparc/machdep.c
  115. +5 −3 sys/arch/sparc/sparc/msiiep.c
  116. +4 −3 sys/arch/sparc64/conf/GENERIC32
  117. +5 −3 sys/arch/sparc64/dev/iommu.c
  118. +5 −3 sys/arch/sun68k/sun68k/bus.c
  119. +10 −16 sys/arch/vax/include/intr.h
  120. +3 −3 sys/arch/vax/uba/qv.c
  121. +5 −3 sys/arch/vax/vax/bus_dma.c
  122. +3 −3 sys/arch/vax/vax/bus_mem.c
  123. +3 −3 sys/arch/x68k/dev/mha.c
  124. +21 −15 sys/arch/x68k/include/intr.h
  125. +5 −3 sys/arch/x68k/x68k/bus.c
  126. +5 −3 sys/arch/x86/x86/bus_dma.c
  127. +4 −3 sys/arch/x86/x86/bus_space.c
  128. +2 −43 sys/arch/xen/i386/machdep.c
  129. +4 −3 sys/arch/xen/x86/bus_space.c
  130. +4 −3 sys/compat/common/tty_43.c
  131. +2 −1 sys/compat/linux/arch/amd64/linux_machdep.h
  132. +9 −3 sys/compat/linux/arch/amd64/linux_syscall.h
  133. +18 −3 sys/compat/linux/arch/amd64/linux_syscallargs.h
  134. +4 −4 sys/compat/linux/arch/amd64/linux_syscalls.c
  135. +6 −6 sys/compat/linux/arch/amd64/linux_sysent.c
  136. +5 −5 sys/compat/linux/arch/amd64/syscalls.master
  137. +3 −3 sys/compat/linux/common/linux_exec.c
  138. +6 −3 sys/compat/linux/common/linux_futex.c
  139. +26 −2 sys/compat/linux/common/linux_misc.c
  140. +33 −10 sys/compat/linux/common/linux_sched.c
  141. +62 −2 sys/compat/linux/common/linux_signal.c
  142. +33 −10 sys/conf/Makefile.kern.inc
  143. +10 −68 sys/conf/files
  144. +32 −2 sys/ddb/db_command.c
  145. +3 −1 sys/ddb/db_command.h
  146. +14 −6 sys/ddb/db_lex.c
  147. +5 −2 sys/ddb/db_lex.h
  148. +9 −2 sys/ddb/db_variables.c
  149. +27 −0 sys/ddb/files.ddb
  150. +2 −1 sys/dev/DEVNAMES
  151. +3 −3 sys/dev/hpc/biconsdev.c
  152. +19 −12 sys/dev/hpc/hpf1275a_tty.c
  153. +3 −3 sys/dev/i2o/dpti.c
  154. +12 −9 sys/dev/ic/aac.c
  155. +23 −31 sys/dev/ic/aic79xx.c
  156. +7 −3 sys/dev/ic/aic79xx_osm.c
  157. +1 −1 sys/dev/ic/aic79xxvar.h
  158. +15 −14 sys/dev/ic/aic7xxx.c
  159. +3 −7 sys/dev/ic/aic7xxx_inline.h
  160. +8 −4 sys/dev/ic/aic7xxx_osm.c
  161. +2 −2 sys/dev/ic/aic7xxxvar.h
  162. +5 −3 sys/dev/ic/ath.c
  163. +3 −1 sys/dev/ic/athioctl.h
  164. +9 −5 sys/dev/ic/atw.c
  165. +342 −156 sys/dev/ic/rtw.c
  166. +4 −2 sys/dev/ic/rtwreg.h
  167. +33 −27 sys/dev/ic/rtwvar.h
  168. +3 −3 sys/dev/ic/siop_common.c
  169. +20 −4 sys/dev/ir/irframe_tty.c
  170. +7 −2 sys/dev/pci/auvia.c
  171. +4 −5 sys/dev/pci/hifn7751.c
  172. +297 −20 sys/dev/pci/if_bge.c
  173. +45 −14 sys/dev/pci/if_bgereg.h
  174. +97 −13 sys/dev/pci/if_iwi.c
  175. +24 −3 sys/dev/pci/if_iwireg.h
  176. +2 −1 sys/dev/pci/if_iwivar.h
  177. +14 −1 sys/dev/pci/if_re_pci.c
  178. +12 −2 sys/dev/pci/if_sk.c
  179. +5 −5 sys/dev/pci/pcidevs
  180. +6 −6 sys/dev/pci/pcidevs.h
  181. +8 −8 sys/dev/pci/pcidevs_data.h
  182. +2 −2 sys/dev/pci/ubsec.c
  183. +3 −3 sys/dev/scsipi/scsiconf.c
  184. +18 −8 sys/dev/sun/sunkbd.c
  185. +18 −7 sys/dev/sun/sunms.c
  186. +4 −4 sys/dev/usb/if_atu.c
  187. +5 −5 sys/dev/usb/if_aue.c
  188. +4 −4 sys/dev/usb/if_axe.c
  189. +4 −4 sys/dev/usb/if_cdce.c
  190. +4 −4 sys/dev/usb/if_cue.c
  191. +4 −4 sys/dev/usb/if_kue.c
  192. +4 −4 sys/dev/usb/if_udav.c
  193. +5 −5 sys/dev/usb/if_upl.c
  194. +4 −4 sys/dev/usb/if_ural.c
  195. +4 −4 sys/dev/usb/if_url.c
  196. +5 −7 sys/dev/usb/ugen.c
  197. +8 −5 sys/dev/usb/uhid.c
  198. +2 −10 sys/dev/usb/uhidev.c
  199. +1 −2 sys/dev/usb/uhidev.h
  200. +44 −18 sys/dev/usb/ums.c
  201. +4 −2 sys/dev/usb/usb_quirks.c
  202. +2 −14 sys/dev/usb/usb_subr.c
  203. +5 −1 sys/dev/usb/usbdevs
  204. +6 −2 sys/dev/usb/usbdevs.h
  205. +12 −4 sys/dev/usb/usbdevs_data.h
  206. +2 −2 sys/dev/usb/usbdi.h
  207. +3 −12 sys/dev/verified_exec.c
  208. +3 −1 sys/dev/wscons/wsconsio.h
  209. +27 −4 sys/dev/wscons/wsmouse.c
  210. +7 −3 sys/dev/wscons/wsmousevar.h
  211. +11 −27 sys/fs/tmpfs/tmpfs_subr.c
  212. +2 −34 sys/kern/init_main.c
  213. +10 −6 sys/kern/kern_lkm.c
  214. +2 −4 sys/kern/kern_proc.c
  215. +8 −7 sys/kern/kern_ras.c
  216. +36 −59 sys/kern/kern_sysctl.c
  217. +11 −7 sys/kern/kern_systrace.c
  218. +9 −5 sys/kern/kern_time.c
  219. +2 −4 sys/kern/kern_verifiedexec.c
  220. +15 −26 sys/kern/tty.c
  221. +257 −232 sys/kern/tty_conf.c
  222. +32 −13 sys/kern/tty_tb.c
  223. +5 −5 sys/miscfs/kernfs/kernfs_vnops.c
  224. +3 −3 sys/net/agr/if_agrsoftc.c
  225. +7 −2 sys/net/if_ppp.c
  226. +40 −17 sys/net/if_sl.c
  227. +5 −5 sys/net/if_slvar.h
  228. +36 −15 sys/net/if_strip.c
  229. +5 −5 sys/net/if_stripvar.h
  230. +20 −6 sys/net/ppp_tty.c
  231. +420 −38 sys/net80211/CHANGES
  232. +17 −0 sys/net80211/files.net80211
  233. +6 −2 sys/net80211/ieee80211.c
  234. +17 −2 sys/net80211/ieee80211_input.c
  235. +14 −5 sys/net80211/ieee80211_netbsd.c
  236. +3 −3 sys/net80211/ieee80211_node.c
  237. +1 −3 sys/netinet/ip_var.h
  238. +16 −4 sys/nfs/nfs_subs.c
  239. +6 −2 sys/nfs/nfs_syscalls.c
  240. +1 −6 sys/nfs/nfsmount.h
  241. +30 −39 sys/opencrypto/crypto.c
  242. +15 −2 sys/opencrypto/cryptodev.c
  243. +2 −2 sys/opencrypto/cryptodev.h
  244. +71 −73 sys/opencrypto/cryptosoft.c
  245. +4 −10 sys/opencrypto/cryptosoft.h
  246. +654 −0 sys/opencrypto/cryptosoft_xform.c
  247. +10 −12 sys/opencrypto/files.opencrypto
  248. +43 −533 sys/opencrypto/xform.c
  249. +3 −18 sys/opencrypto/xform.h
  250. +12 −7 sys/sys/conf.h
  251. +1 −2 sys/sys/lkm.h
  252. +12 −12 sys/sys/localedef.h
  253. +2 −2 sys/sys/param.h
  254. +2 −2 sys/sys/proc.h
  255. +4 −1 sys/sys/socket.h
  256. +3 −1 sys/sys/systrace.h
  257. +1 −2 sys/sys/tty.h
  258. +15 −10 sys/ufs/ffs/ffs_alloc.c
  259. +35 −0 sys/uvm/files.uvm
  260. +5 −1 sys/uvm/uvm.h
  261. +2 −1 sys/uvm/uvm_page.h
  262. +7 −2 sys/uvm/uvm_pager.c
  263. +10 −2 sys/uvm/uvm_pdaemon.c
  264. +16 −2 sys/uvm/uvm_stat.c
  265. +32 −2 sys/uvm/uvm_vnode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.13 2005/04/01 11:59:22 yamt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.13.8.1 2005/11/29 21:22:56 yamt Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.13 2005/04/01 11:59:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.13.8.1 2005/11/29 21:22:56 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -652,6 +652,8 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
vaddr_t va;
bus_addr_t addr;
int curseg;
+ const uvm_flag_t kmflags =
+ (flags & BUS_DMA_NOWAIT) != 0 ? UVM_KMF_NOWAIT : 0;
/*
* If we're only mapping 1 segment, use K0SEG, to avoid
@@ -667,7 +669,7 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
size = round_page(size);
- va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY);
+ va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY | kmflags);
if (va == 0)
return (ENOMEM);
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.59 2005/07/30 17:25:51 mhitch Exp $ */
+/* $NetBSD: bus_dma.c,v 1.59.6.1 2005/11/29 21:22:56 yamt Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.59 2005/07/30 17:25:51 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.59.6.1 2005/11/29 21:22:56 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -574,6 +574,8 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
vaddr_t va;
bus_addr_t addr;
int curseg;
+ const uvm_flag_t kmflags =
+ (flags & BUS_DMA_NOWAIT) != 0 ? UVM_KMF_NOWAIT : 0;
/*
* If we're only mapping 1 segment, use K0SEG, to avoid
@@ -586,7 +588,7 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
size = round_page(size);
- va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY);
+ va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY | kmflags);
if (va == 0)
return (ENOMEM);
@@ -22,7 +22,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.277 $"
+#ident "GENERIC-$Revision: 1.277.2.1 $"
maxusers 32
@@ -611,7 +611,8 @@ wsmouse* at vsms?
wskbd* at pckbd?
wsmouse* at pms?
-pseudo-device crypto # opencrypto framework
+pseudo-device crypto # /dev/crypto device
+pseudo-device swcrypto # software crypto implementation
pseudo-device bpfilter 16
pseudo-device ccd 4
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.72 2005/11/03 23:12:16 rpaulo Exp $
+# $NetBSD: GENERIC,v 1.72.2.1 2005/11/29 21:22:56 yamt Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.72 $"
+#ident "GENERIC-$Revision: 1.72.2.1 $"
maxusers 32 # estimated number of users
@@ -805,7 +805,8 @@ include "arch/amd64/conf/GENERIC.local"
# Pseudo-Devices
-pseudo-device crypto # opencrypto framework
+pseudo-device crypto # /dev/crypto device
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.40 2005/10/10 17:24:38 dsl Exp $
+# $NetBSD: INSTALL,v 1.40.6.1 2005/11/29 21:22:56 yamt Exp $
#
# GENERIC machine description file
#
@@ -20,13 +20,13 @@
include "arch/amd64/conf/std.amd64"
-#ident "INSTALL-$Revision: 1.40 $"
+#ident "INSTALL-$Revision: 1.40.6.1 $"
maxusers 32 # estimated number of users
# Standard system options
-makeoptions COPTS="-Os"
+makeoptions COPTS="-Os -fno-asynchronous-unwind-tables"
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -286,7 +286,7 @@ ahd* at pci? dev ? function ? # Adaptec aic790x SCSI
bha* at pci? dev ? function ? # BusLogic 9xx SCSI
dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI
-# isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
+isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID
mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
@@ -411,17 +411,17 @@ bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
en* at pci? dev ? function ? # ENI/Adaptec ATM
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
+#esh* at pci? dev ? function ? # Essential HIPPI card
ex* at pci? dev ? function ? # 3Com 90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
#hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
-le* at pci? dev ? function ? # PCnet-PCI Ethernet
-lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
+#le* at pci? dev ? function ? # PCnet-PCI Ethernet
+#lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
ne* at pci? dev ? function ? # NE2000-compatible Ethernet
-ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
+#ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
pcn* at pci? dev ? function ? # AMD PCnet-PCI Ethernet
re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S
rtk* at pci? dev ? function ? # Realtek 8129/8139
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.7 2005/07/12 20:22:45 sekiya Exp $
+# $NetBSD: Makefile.amd64,v 1.7.6.1 2005/11/29 21:22:56 yamt Exp $
# Makefile for NetBSD
#
@@ -115,8 +115,17 @@ ATH_UUDEC?= @${_MKSHMSG} "uudecode ${.CURDIR:T}/${.TARGET}"; \
${UUDECODE} -p $> \> ${.TARGET}; \
rm -f ${.TARGET}; \
${UUDECODE} -p $> > ${.TARGET}
+
athhal-x86_64-elf.hal.o: athhal-x86_64-elf.hal.o.uue
${ATH_UUDEC}
+.if !empty(COPTS:M-fno-asynchronous-unwind-tables)
+ mv $@ $@.eh_frame
+ ${_MKSHECHO}\
+ ${OBJCOPY} -R .eh_frame $@.eh_frame $@
+ ${OBJCOPY} -R .eh_frame $@.eh_frame $@
+ rm -f $@.eh_frame
+.endif
+
all depend: opt_ah.h
opt_ah.h: athhal-x86_64-elf.opt_ah.h
ln -s ${.ALLSRC} ${.TARGET}
View
@@ -1,4 +1,4 @@
-/* $NetBSD: sci.c,v 1.32 2005/06/13 21:34:17 jmc Exp $ */
+/* $NetBSD: sci.c,v 1.32.8.1 2005/11/29 21:22:56 yamt Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sci.c,v 1.32 2005/06/13 21:34:17 jmc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sci.c,v 1.32.8.1 2005/11/29 21:22:56 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -246,7 +246,7 @@ sci_scsidone(struct sci_softc *dev, int stat)
switch(stat) {
case SCSI_CHECK:
xs->resid = 0;
- /* FALLTHOUGH */
+ /* FALLTHROUGH */
case SCSI_BUSY:
xs->error = XS_BUSY;
break;
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.24 2005/04/01 11:59:23 yamt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.24.8.1 2005/11/29 21:22:56 yamt Exp $ */
/* NetBSD: bus_dma.c,v 1.20 2000/01/10 03:24:36 simonb Exp */
/*-
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.24 2005/04/01 11:59:23 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.24.8.1 2005/11/29 21:22:56 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -668,6 +668,8 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
vaddr_t va;
bus_addr_t addr;
int curseg;
+ const uvm_flag_t kmflags =
+ (flags & BUS_DMA_NOWAIT) != 0 ? UVM_KMF_NOWAIT : 0;
/*
* If we're only mapping 1 segment, use KSEG0 or KSEG1, to avoid
@@ -683,7 +685,7 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
size = round_page(size);
- va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY);
+ va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY | kmflags);
if (va == 0)
return ENOMEM;
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_sparse.c,v 1.12 2005/04/01 11:59:23 yamt Exp $ */
+/* $NetBSD: bus_space_sparse.c,v 1.12.8.1 2005/11/29 21:22:56 yamt Exp $ */
/* NetBSD: bus_machdep.c,v 1.1 2000/01/26 18:48:00 drochner Exp */
/*-
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space_sparse.c,v 1.12 2005/04/01 11:59:23 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space_sparse.c,v 1.12.8.1 2005/11/29 21:22:56 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@ arc_sparse_bus_space_compose_handle(bus_space_tag_t bst, bus_addr_t addr,
} else {
vaddr_t va,
vaddr = uvm_km_alloc(kernel_map, (vsize_t)(end - start), 0,
- UVM_KMF_VAONLY);
+ UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
if (vaddr == 0)
panic("arc_sparse_bus_space_compose_handle: "
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.125 2005/11/03 16:48:29 chs Exp $
+# $NetBSD: GENERIC,v 1.125.2.1 2005/11/29 21:22:56 yamt Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.125 $"
+#ident "GENERIC-$Revision: 1.125.2.1 $"
maxusers 32 # estimated number of users
@@ -399,7 +399,8 @@ wsmouse* at pms?
#### Pseudo devices
-pseudo-device crypto # opencrypto framework
+pseudo-device crypto # /dev/crypto device
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
@@ -1,8 +1,4 @@
-# $NetBSD: Makefile.arc.inc,v 1.13 2005/05/07 14:15:05 tsutsui Exp $
+# $NetBSD: Makefile.arc.inc,v 1.13.8.1 2005/11/29 21:22:56 yamt Exp $
CFLAGS+= -mips2
AFLAGS+= -mips2
-
-SYSTEM_LD_TAIL_EXTRA=; \
- echo "${DBSYM} $@ || true"; \
- ${DBSYM} $@ || true
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.44 2005/04/01 11:59:23 yamt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.44.8.1 2005/11/29 21:22:56 yamt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.44 2005/04/01 11:59:23 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.44.8.1 2005/11/29 21:22:56 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -826,14 +826,16 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
bus_addr_t addr;
int curseg;
pt_entry_t *ptep/*, pte*/;
+ const uvm_flag_t kmflags =
+ (flags & BUS_DMA_NOWAIT) != 0 ? UVM_KMF_NOWAIT : 0;
#ifdef DEBUG_DMA
printf("dmamem_map: t=%p segs=%p nsegs=%x size=%lx flags=%x\n", t,
segs, nsegs, (unsigned long)size, flags);
#endif /* DEBUG_DMA */
size = round_page(size);
- va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY);
+ va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY | kmflags);
if (va == 0)
return (ENOMEM);
@@ -1,4 +1,4 @@
-/* $NetBSD: ep93xx_space.c,v 1.2 2005/04/01 11:59:24 yamt Exp $ */
+/* $NetBSD: ep93xx_space.c,v 1.2.8.1 2005/11/29 21:22:56 yamt Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_space.c,v 1.2 2005/04/01 11:59:24 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_space.c,v 1.2.8.1 2005/11/29 21:22:56 yamt Exp $");
/*
* bus_space I/O functions for ep93xx
@@ -156,7 +156,8 @@ ep93xx_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
startpa = trunc_page(bpa);
/* Get some VM. */
- va = uvm_km_alloc(kernel_map, endpa - startpa, 0, UVM_KMF_VAONLY);
+ va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
+ UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
if (va == 0)
return ENOMEM;
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_io.c,v 1.11 2005/07/30 15:14:29 chris Exp $ */
+/* $NetBSD: footbridge_io.c,v 1.11.6.1 2005/11/29 21:22:56 yamt Exp $ */
/*
* Copyright (c) 1997 Causality Limited
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.11 2005/07/30 15:14:29 chris Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.11.6.1 2005/11/29 21:22:56 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -208,7 +208,8 @@ footbridge_mem_bs_map(t, bpa, size, flags, bshp)
* multiple mappings
*/
- va = uvm_km_alloc(kernel_map, endpa - startpa, 0, UVM_KMF_VAONLY);
+ va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
+ UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
if (va == 0)
return ENOMEM;
Oops, something went wrong.

0 comments on commit c05e260

Please sign in to comment.