Commit Graph

118785 Commits

Author SHA1 Message Date
ru
2d53485ac9 MFC:
- Add loader(8) variables for RB_DFLTROOT, RB_MUTE, and RB_PAUSE:
  "boot_dfltroot", "boot_mute", and "boot_pause" respectively.

- Cause all flags passed by boot2 to set the respective loader(8)
  boot_* variable.  The end effect is that all flags from boot2
  are now passed to the kernel.

Approved by:	re (scottl)
2006-02-14 06:20:16 +00:00
marcel
ae752767c9 MFC fixes for MCA MPSAFEness:
mca.c:1.11
	mp_machdep.c:1.60

Approved by: re (scottl, thanks!)
2006-02-14 03:40:49 +00:00
rwatson
c4063eb562 Merge mbuf.c:1.48 from HEAD to RELENG_6:
Sort sfbuf allocation counters with other sfbuf information.

Approved by:	re (scottl)
2006-02-14 03:39:04 +00:00
rwatson
f9a413bf3e Merge memstat_uma.c:1.17 from HEAD to RELENG_6:
Update copyright for 2006.

Approved by:	re (scottl)
2006-02-14 03:38:31 +00:00
rwatson
67ad5e7105 Merge uma_core.c:1.136 from HEAD to RELENG_6:
Skip per-cpu caches associated with absent CPUs when generating a
  memory statistics record stream via sysctl.

Approved by:	re (scottl)
2006-02-14 03:37:58 +00:00
rwatson
c2f1fc6b2c Merge memstat_uma.c:1.16 from HEAD to RELENG_6:
The uma_zone data structure defines the size of its uz_cpu[] array as 1,
  but then sizes the containing data structure at run-time to make room
  for per-cpu cache data.  Modify libmemstat to separately allocate a
  buffer to hold per-cpu cache data, sized based on the run-time mp_maxid
  variable when using libkvm to access UMA data.  This avoids reading
  invalid cache data from beyond the end of the uma_zone data structure
  on the stack, which can result in invalid statistics and/or reads from
  invalid kernel addresses.

Approved by:	re (scottl)
2006-02-14 03:37:12 +00:00
rwatson
dfedbdbb8a Merge memstat_uma.c:1.15 from HEAD to RELENG_6:
When reporting an error reading from UMA per-cpu cache pointers using KVM,
  return a KVM error rather than an out of memory error, so that the caller
  reports the KVM error state.  This replaces a misleading error message
  with a more accurate although equally confusing one.

Approved by:	re (scottl)
2006-02-14 03:36:21 +00:00
rwatson
8a6e1d37f3 Merge memstat_uma.c:1.14 from HEAD to RELENG_6:
Read all_cpus variable out of kmem, and validate CPUs against the all_cpus
  cpu mask before looking at the cache entries for the CPU.  For systems
  with sparse CPU id arrays, this skips otherwise uninitialized cache
  structures.

Approved by:	re (scottl)
2006-02-14 03:35:26 +00:00
rwatson
6e53964350 Merge mbuf.c:1.47 from HEAD to RELENG_6:
Un-#if 0 the printing of allocation failure counts for mbufs, clusters,
  and packets in netstat -m.

Approved by:	re (scottl)
2006-02-14 03:33:49 +00:00
rwatson
837a6e1c15 Merge memstat_uma.c:1.13 from HEAD to RELENG_6:
Correct a typo in the extraction of zone information from UMA using kmem:
  bytes = allocated - freed, not bytes = allocated = freed.

Approved by:	re (scottl)
2006-02-14 03:33:06 +00:00
rwatson
ddcacb3189 Merge login_ok.c:1.12 from HEAD to RELENG_6:
Fix typo in comment.

Approved by:	re (scottl)
2006-02-14 03:32:15 +00:00
rwatson
b765ebeb75 Merge subr_disk.c:1.86 from HEAD to RELENG_6:
When calling bioq_first() to see if a queue is empty in bioq_disksort(),
  don't save the return value as we won't use it.

  Noticed by:     Coverity Prevent analysis tool

Approved by:	re (scottl)
2006-02-14 03:29:31 +00:00
rwatson
d6eb8543f9 Merge kdump.1:1.13, kdump.c:1.27, as well as some of the mdoc cleanups
present in kdump.1:1.15:

  Add a "-H" argument to kdump, which causes kdump to print an additional
  field holding the threadid.  This is more useful for libthr than
  libpthread, but still quite useful in libpthread as it can be used to
  process interlaced records from multiple threads over the course of a
  system call.

  Detect old ktr_buffer values using the heuristic "if it's negative,
  then it must not be a valid threadid".  This may leave something to be
  desired.

  Reviewed by:    davidxu

Approved by:	re (scottl)
2006-02-14 03:28:31 +00:00
hrs
c77cc79176 standard-supfile on RELENG_6 is for 6.x-STABLE now, not -current.
Spotted by:	yar
Approved by:	re (implicitly)
2006-02-14 02:32:25 +00:00
hrs
f447727bc7 MFC: Fix a bug which puts an incorrect checksum of CHECKSUM.MD5
into the CHECKSUM.MD5 file itself.

Approved by:	re (scottl)
2006-02-14 02:00:24 +00:00
rwatson
2bb304d44c Merge memstat_uma.c:1.12 from HEAD to RELENG_6:
Remove unnecessary and undesirable 'static' from function-local keg
  list, which could cause problems for multi-threaded applications
  using libmemstat to monitor UMA in more than one thread
  simultaneously.

Approved by:	re (scottl)
2006-02-14 00:07:17 +00:00
rwatson
f017c618f0 Merge nfs_lock.c:1.43 from HEAD to RELENG_6:
In nfs_dolock(), GC now under-used ioflg, rendered obsolete when we moved
  from using a fifo to talk to rpc.lockd to using a special device node.

Approved by:	re (scottl)
2006-02-14 00:06:32 +00:00
rwatson
bfd457b328 Merge vnode.h:1.312 from HEAD to RELENG_6:
Rename uid and gid arguments to vaccess() prototype to match vaccess()
  implementation in vfs_subr.c.  No functional change.

Approved by:	re (scottl)
2006-02-14 00:03:00 +00:00
rwatson
48d1eb882f Merge kern_ktrace.c:1.103, ktrace.h:1.31 from HEAD to RELENG_6:
Reuse ktr_unused field in ktr_header structure as ktr_tid; populate
  ktr_tid as part of gathering of ktr header data for new ktrace
  records.  The continued use of intptr_t is required for file layout
  reasons, and cannot be changed to lwpid_t at this point.

  Reviewed by:    davidxu

Approved by:	re (scottl)
2006-02-14 00:02:01 +00:00
rwatson
0a7e5efc42 Merge atm_signal.c:1.14 from HEAD to RELENG_6:
Convert function declarations to ANSI C.

Approved by:	re (scottl)
2006-02-13 23:54:48 +00:00
rwatson
c38e03130c Merge fnmatch.c:1.20 from HEAD to RELENG_6:
Convert function declarations to ANSI C.

Approved by:	re (scottl)
2006-02-13 23:52:29 +00:00
rwatson
24a7189e9d Merge uipc_sem.c:1.22 from HEAD to RELENG_6:
Convert remaining functions to ANSI C function declarations.

Approved by:	re (scottl)
2006-02-13 23:51:19 +00:00
rwatson
5db3947c25 Merge Makefile:1.4 from HEAD to RELENG_6:
Correct help line: list targets, not names of files generated by targets
  when no argument is provided to make.

Approved by:	re (scottl)
2006-02-13 23:48:26 +00:00
rwatson
8e731cacbc Merge mergemaster.8:1.34, mergemaster.sh:1.53 from HEAD to RELENG_6:
Add a -A argument to mergemaster to allow explicitly specifying an
  architecture to pass through to the underlying makefiles.  This is
  quite useful when building on an i386 box to populate an amd64 NFS
  root.

  Head nod:       dougb

Approved by:	re (scottl)
2006-02-13 23:47:48 +00:00
rwatson
25bf323777 Merge ip_input.c:1.311 from HEAD to RELENG_6:
Modify the IP fragment reassembly code so that it uses a new UMA zone,
  ipq_zone, to allocate fragment headers from, rather than using cast mbuf
  storage.  This was one of the few remaining uses of mbuf storage for
  local data structures that relied on dtom().  Implement the resource
  limit on ipq's using UMA zone limits, but preserve current sysctl
  semantics using a sysctl proc.

Approved by:	re (scottl)
2006-02-13 23:46:31 +00:00
rwatson
f55041bfd1 MFC ip_input.c:1.310:
Staticize ipqlock, since it is local to ip_input.c.

Approved by:	re (scottl)
2006-02-13 23:44:20 +00:00
ceri
bc3c1b31ae MFC revision 1.10:
Another update for reality: "dangerously dedicated" mode is
  now achieved by hitting 'F', which is no longer undocumented.

Approved by:	re (scottl)
2006-02-13 21:03:55 +00:00
ceri
4285305817 MFC revision 1.414:
Correct a user-visible typo.

Approved by:	re (scottl)
2006-02-13 21:02:35 +00:00
ceri
b86b7b2ee0 MFC the following revisions of the help files:
Bring these files somewhat into the present.
  Perform some rewording while here.

  Remove register.hlp, since the code that deals with it was removed
  nearly 7 years ago.

  Revision  Changes    Path
  1.2       +2 -0      src/usr.sbin/sysinstall/help/anonftp.hlp
  1.15      +9 -10     src/usr.sbin/sysinstall/help/distributions.hlp
  1.5       +1 -5      src/usr.sbin/sysinstall/help/fixit.hlp
  1.3       +1 -1      src/usr.sbin/sysinstall/help/html.hlp
  1.9       +75 -18    src/usr.sbin/sysinstall/help/options.hlp
  1.14      +2 -2      src/usr.sbin/sysinstall/help/partition.hlp
  1.6       +0 -76     src/usr.sbin/sysinstall/help/register.hlp (dead)
  1.3       +2 -2      src/usr.sbin/sysinstall/help/securelevel.hlp
  1.12      +15 -12    src/usr.sbin/sysinstall/help/shortcuts.hlp
  1.9       +1 -7      src/usr.sbin/sysinstall/help/slice.hlp
  1.10      +10 -2     src/usr.sbin/sysinstall/help/tcp.hlp
  1.7       +5 -5      src/usr.sbin/sysinstall/help/usermgmt.hlp

Approved by:	re (scottl)
2006-02-13 21:01:23 +00:00
marius
aa6cc742fc MFC: 1.2
Add a reference to le(4) as the SBus-based Ultra 1 have on-board LANCE.

Approved by:	re (scottl)
2006-02-13 11:47:47 +00:00
marius
7f97c07671 MFC: 1.29
Add le(4) to the list of devices supporting VLAN-sized frames natively.

Approved by:	re (scottl)
2006-02-13 11:46:51 +00:00
marius
f7e21cec3c MFC: share/man/man4/Makefile 1.337, src/share/man/man4/le.4 1.2
Add a man page for le(4).

Approved by:	re (scottl)
2006-02-13 11:45:21 +00:00
marius
05e831efa6 MFC: sys/conf/NOTES 1.1349, sys/conf/files 1.1090,
sys/conf/files.sparc64 1.78, sys/modules/Makefile 1.471,
     sys/modules/le/Makefile 1.1, sys/sparc64/conf/GENERIC 1.105

Hook up le(4) to the build.

Approved by:	re (scottl)
2006-02-13 11:39:02 +00:00
marius
6ab8768830 MFC: sys/dev/le/am7990.c 1.1, sys/dev/le/am79900.c 1.1,
sys/dev/le/am79900reg.h 1.1, sys/dev/le/am79900var.h 1.1,
     sys/dev/le/am7990reg.h 1.1, sys/dev/le/am7990var.h 1.1,
     sys/dev/le/if_le_ledma.c 1.1, sys/dev/le/if_le_pci.c 1.1,
     sys/dev/le/lance.c 1.1, sys/dev/le/lancereg.h 1.1,
     sys/dev/le/lancevar.h 1.1

Add le(4), a driver for AMD Am7900 LANCE and Am79C9xx PCnet NICs,
ported from NetBSD.
This version differs from HEAD in that if_le_ledma.c inlines
lsi64854_enet_intr() from rev. 1.8 of sys/sparc64/sbus/lsi64854.c
in le_dma_hwintr() in order to not break the API of the LSI64854
driver in RELENG_6.

Approved by:	re (scottl)
2006-02-13 11:30:40 +00:00
marius
5e734a4bf4 MFC: 1.17
- Don't shift the clock frequency in MHz left by 8 before assigning it
  to sbus_mdvec.dv_clock as sbus_mdvec.dv_clock is meant to be specified
  in MHz. While this was a bug it shouldn't have affected FreeBSD/sparc64
  as sbus_mdvec.dv_clock is used to limit the clock rate of chips when
  a machine isn't able to support them at maximum speed which isn't the
  case for sun4u machines.
- Remove the code that checks whether the clock frequency returned by
  sbus_get_clockfreq() is 0 and falls back to 25MHz if it is as that's
  already done in sbus(4).

Approved by:	re (scottl)
2006-02-12 22:57:04 +00:00
marius
100fc73647 MFC: 1.15
- Sync the list of supported chips with pcn_probe() as of sys/pci/if_pcn.c
  rev. 1.77 (also applies to RELENG_6), i.e. remove Am53C974/Am79C970/
  Am79C974 PCnet-PCI and Am79C970A PCnet-PCI II.
- Change the entry of the PCnet-Home in the list of supported chips to
  match the other ones, i.e. s,PCnet/Home HomePNA,Am79C978 PCnet-Home,.
- s,familly,family

Approved by:	re (scottl)
2006-02-12 22:20:09 +00:00
flz
fadeb41ea3 MFC:
- Add a startup script for hostapd.
  - Document associated variable in rc.conf(5).

      src/etc/rc.d/Makefile: rev 1.64 -> 1.65
      src/share/man/man5/rc.conf.5: rev 1.283 -> 1.284
      src/etc/rc.d/hostapd: rev 0 -> 1.1
      src/etc/defaults/rc.conf: rev 1.273 -> 1.274

Approved by:	re (hrs)
2006-02-12 22:13:16 +00:00
sam
1d09453a57 pad embedded structs so we can preserve abi's moving forward
Reviewed by:	scottl, dwhite, kensmith, avatar
Approved by:	re
2006-02-12 19:00:39 +00:00
delphij
f865c8d9db MFC a set of changes that fixes DHCP handling in sysinstall(8)
* network.c,v 1.53 (by ceri):
   Fixes DHCP handling to use a more robust way to determine whether
   DHCP should be used.
 * tcpip.c,v 1.134:
   Avoid adding unnecessary tailing space when no media option(s) is
   specified.

Approved by:	re (scottl)
2006-02-12 15:23:50 +00:00
yar
da071e483e MFC rev. 1.95:
Set IFF_BROADCAST and IFF_MULTICAST on vlan interfaces from the
  beginning and simply refuse to attach to a parent without either
  flag.  Our network stack doesn't like those flags changing and
  there is no need in them doing so.

Approved by:	re (scottl)
2006-02-12 12:19:06 +00:00
marcel
848bf6d236 MFC:
src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml:1.295
	src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml:1.10
	src/release/doc/share/misc/dev.archlist.txt:1.77

Approved by: re (hrs; thanks!)
2006-02-11 18:54:19 +00:00
ume
938d160249 MFC 1.168: Never select the PCB that has INP_IPV6 flag and is bound
to :: if we have another PCB which is bound to 0.0.0.0.  If a PCB has
the INP_IPV6 flag, then we set its cost higher than IPv4 only PCBs.

Approved by:	re (scottl)
2006-02-11 09:02:59 +00:00
brueffer
72689fc263 MFC: rev. 1.18
Clean up some sysctl descriptions, debug messages etc.

Approved by:	re (scottl)
2006-02-11 08:25:22 +00:00
ume
69d4324002 MFC: obey opt_inet6.h and opt_ipsec.h in kernel build directory.
src/sys/modules/ipfw/Makefile:	1.22, 1.23
	src/sys/netinet/ip_fw2.c:	1.117
	src/sys/netinet/ip_fw_pfil.c:	1.20

Approved by:	re (scottl)
2006-02-11 08:19:37 +00:00
imp
9b115c7d4d MFC: add cardbus_device.c. This file was left out when the rest of the
changes were merged, resulting in load errors at boot time.

Approved by: re@ (scottl)
2006-02-11 06:55:50 +00:00
marcel
d92c912d8a MFC rev. 1.6, 1.7: Add HARDWARE section.
Approved by: re (hrs)
2006-02-11 06:30:41 +00:00
yar
25d6e2cc4f MFC:
Avoid creating (and subsequently using) fake opt_*.h files
when the modules are built with the kernel and hence actual
opt_*.h files are available in ${KERNBUILDDIR}.  Fix a few
small bugs that would prevent this from working.

At last the build options of the modules become consistent
with those of the kernel unless the MODULES_WITH_WORLD way
still is used.

Approved by:	re (kensmith, scottl)
Requested by:	ru
Tested on:	amd64 i386 sparc64
Tested by:	md5
2006-02-10 00:38:08 +00:00
ru
cc436d7bbf MFC: 1.35: Fix interface output queue handling.
Approved by:	re (scottl)
2006-02-09 16:59:37 +00:00
yar
af897e152b MFC ifconfig.c rev. 1.117:
Do address assignment/removal operations after callbacks.  Presently,
ifconfig callbacks are used for L2 configuration, media and vlan,
so actions associated with address assignment, like sending out a
gratuitous ARP, should go when L2 is running already.

Return ifvlan.c to the state of rev. 1.7.2.2 -- undo the last
back-out.  The above change to ifconfig.c lets us use a callback
for vlan set-up without facing the evil side-effects from IP
assignment to an orphaned vlan interface.

Approved by:	re (scottl)
2006-02-09 10:48:43 +00:00
ume
64eea879fa MFC 1.56: make IPV6_V6ONLY socket option work for UDP as well.
Approved by:	re (scottl)
2006-02-09 02:33:14 +00:00