rwatson [Tue, 14 Feb 2006 03:28:31 +0000 (03:28 +0000)]
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.
rwatson [Tue, 14 Feb 2006 00:07:17 +0000 (00:07 +0000)]
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.
rwatson [Tue, 14 Feb 2006 00:02:01 +0000 (00:02 +0000)]
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.
rwatson [Mon, 13 Feb 2006 23:47:48 +0000 (23:47 +0000)]
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.
rwatson [Mon, 13 Feb 2006 23:46:31 +0000 (23:46 +0000)]
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.
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.
marius [Sun, 12 Feb 2006 22:57:04 +0000 (22:57 +0000)]
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).
marius [Sun, 12 Feb 2006 22:20:09 +0000 (22:20 +0000)]
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
delphij [Sun, 12 Feb 2006 15:23:50 +0000 (15:23 +0000)]
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.
yar [Sun, 12 Feb 2006 12:19:06 +0000 (12:19 +0000)]
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.
ume [Sat, 11 Feb 2006 09:02:59 +0000 (09:02 +0000)]
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.
yar [Fri, 10 Feb 2006 00:38:08 +0000 (00:38 +0000)]
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
yar [Thu, 9 Feb 2006 10:48:43 +0000 (10:48 +0000)]
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.
davidxu [Tue, 7 Feb 2006 00:29:33 +0000 (00:29 +0000)]
MFC amd64/amd64/machdep.c revision 1.646, i386/i386/machdep.c
revision 1.622
>
> Clear carry flag in get_mcontext so that setcontext does not
> return a bogus error.
>
> PR: misc/92110
kensmith [Wed, 1 Feb 2006 18:04:43 +0000 (18:04 +0000)]
Note that we've entered code freeze and the 6.1-RELEASE cycle has
begun but we're not ready to branch yet so we call it PRERELEASE
between now and when we're ready to branch.
stefanf [Wed, 1 Feb 2006 12:24:39 +0000 (12:24 +0000)]
Unbreak building RELENG_6 on RELENG_5 by providing a __format_arg macro if
it's not defined in <sys/cdefs.h>. This situation happens early when building
the bootstrap-tools, where the new <nl_types.h> is mixed with the old
<sys/cdefs.h>.
jkim [Tue, 31 Jan 2006 22:07:18 +0000 (22:07 +0000)]
MFC: usr.sbin/sysinstall/disks.c 1.155
- Hide 'incorrect geometry warning' in non-interactive mode. Users should
know what they are doing in non-interactive mode. Less scarier warning
goes to debugging info instead.
- Print sanitized geometry to debugging info.
joel [Tue, 31 Jan 2006 18:31:34 +0000 (18:31 +0000)]
MFC r1.46:
- Remove the comment about WSS/MSS cards being the best supported
cards on the market.
- Remove the entire HARDWARE section. It's superfluous since all
snd_* manual pages have their own HARDWARE sections these days.
glebius [Tue, 31 Jan 2006 15:44:51 +0000 (15:44 +0000)]
MFC:
- In pipe() return the error returned by pipe_create(), rather then
hardcoded ENFILES, which is incorrect. pipe_create() can fail due
to ENOMEM.
- Update manual page, describing ENOMEM return code.
oleg [Tue, 31 Jan 2006 14:48:03 +0000 (14:48 +0000)]
MFC 1.124:
Fix minor bug in uRPF: if net.link.ether.inet.useloopback=1 and we send
broadcast packet using our own source ip address it may be rejected by
uRPF rules.
imp [Tue, 31 Jan 2006 14:42:43 +0000 (14:42 +0000)]
I haven't yet merged back the defines from -current for
__PCI_REROUTE_INTERRUPT, so merging it was in error. I thought I'd
specifically checked before the commit, but it looks like I was wrong.
Thanks to Peter Pentchev (roam@) for his help in finding this...
projects / FreeBSD / FreeBSD.git / log