CVS commit: src/sys/dev/acpi

2010-06-05 Thread Jukka Ruohonen
Module Name:src
Committed By:   jruoho
Date:   Sat Jun  5 07:59:13 UTC 2010

Modified Files:
src/sys/dev/acpi: acpi_power.c

Log Message:
Convert an aprint_error_dev() to ACPI_DEBUG_PRINT in acpi_power_set().

This "fixes" the issue observed by dyo...@. Since the AML may not keep any
state by itself, it is possible that the firmware tries to continuously put
a device into a power state where the device already is (e.g. D3 -> D3).

XXX: The code (like the old power resource code) rests on the assumption
 that it is possible to reliably obtain the power state of a device
 either directly via _PSC or indirectly via _STA. However, because there
 is some evidence that few broken systems implement these methods
 incorrectly (e.g. always returns D0 as a constant, even if the state
 would be D3 in reality), we may need to revisit this by always setting
 the power state, even if it is impossible to get the power state.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/acpi_power.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.bin/ftp

2010-06-05 Thread Luke Mewburn
Module Name:src
Committed By:   lukem
Date:   Sat Jun  5 13:59:39 UTC 2010

Modified Files:
src/usr.bin/ftp: util.c version.h

Log Message:
In ftpvis(), prevent incomplete escape sequences at end of dst,
and ensure NUL-termination of dst.  Also tweak for readibility.
Fix from Uwe Stuehler and Stefan Sperling, via Marc Balmer.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/usr.bin/ftp/util.c
cvs rdiff -u -r1.81 -r1.82 src/usr.bin/ftp/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/acpi

2010-06-05 Thread Jukka Ruohonen
Module Name:src
Committed By:   jruoho
Date:   Sat Jun  5 15:31:22 UTC 2010

Modified Files:
src/sys/dev/acpi: acpi_wakedev.c

Log Message:
Complete the support for wakeup devices. As imposed by the standard, all
power resources should be turned on for wakeup devices. This follows common
sense: a device cannot wake if the power of it is turned off.

ok jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/acpi/acpi_wakedev.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/acpi

2010-06-05 Thread Jukka Ruohonen
Module Name:src
Committed By:   jruoho
Date:   Sat Jun  5 15:47:59 UTC 2010

Modified Files:
src/sys/dev/acpi: acpi_wakedev.c

Log Message:
Switch the third argument to the _DSW method from 3 to 0. This means that
devices should be placed in the D0 state ("fully on") after resume. We were
not prepared to handle the previous value as it implied that devices could
be placed in an arbitrary power state once in S0.

Minimal functional change, given that the _DSW is seldom seen in the field.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/acpi_wakedev.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/libc/locale

2010-06-05 Thread Takehiko NOZAKI
Module Name:src
Committed By:   tnozaki
Date:   Sat Jun  5 16:37:13 UTC 2010

Modified Files:
src/lib/libc/locale: rune_local.h runetype_local.h

Log Message:
remove unused magic.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/locale/rune_local.h
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/locale/runetype_local.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/acpi/acpica

2010-06-05 Thread Jukka Ruohonen
Module Name:src
Committed By:   jruoho
Date:   Sat Jun  5 16:47:49 UTC 2010

Modified Files:
src/sys/dev/acpi/acpica: OsdSchedule.c

Log Message:
Remove the recently added warning about long Sleep() requests.

This is now in ACPICA (20100528):

Added support to limit the maximum time for the ASL Sleep()
operator. To prevent accidental deep sleeps, limit the maximum time
that Sleep() will actually sleep. Configurable, the default maximum
is two seconds. ACPICA bugzilla 854.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/acpica/OsdSchedule.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/acpi/acpica

2010-06-05 Thread Jukka Ruohonen
Module Name:src
Committed By:   jruoho
Date:   Sat Jun  5 16:57:48 UTC 2010

Modified Files:
src/sys/dev/acpi/acpica: OsdSchedule.c

Log Message:
Remove also the debug-printf in case of long Stall() requests;

   /*
* sleep(9) isn't safe because AcpiOsStall may be called
* with interrupt-disabled. (eg. by AcpiEnterSleepState)
* we should watch out for long stall requests.
*/

ACPICA has long printed a similar warning by itself. Moreover, this message
was never reached as the interpreter does not invoke AcpiOsStall() when a
delay longer than 255 usec is requested.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpica/OsdSchedule.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.bin/sort

2010-06-05 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sat Jun  5 17:44:51 UTC 2010

Modified Files:
src/usr.bin/sort: sort.c sort.h

Log Message:
fixit() needs to know the getopt options list to do its thing correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.bin/sort/sort.c
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/sort/sort.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.bin/sort

2010-06-05 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sat Jun  5 17:46:08 UTC 2010

Modified Files:
src/usr.bin/sort: init.c

Log Message:
Rework previous change to fixit() to not trip on option arguments. (Noticed
by wiz.) Clarify the loop logic involved.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/sort/init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.bin/calendar/calendars

2010-06-05 Thread John Nemeth
Module Name:src
Committed By:   jnemeth
Date:   Sat Jun  5 20:53:44 UTC 2010

Modified Files:
src/usr.bin/calendar/calendars: calendar.history

Log Message:
The US formally left the Gold Standard in 1971, not 1933.  See:
http://en.wikipedia.org/wiki/Nixon_Shock


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/calendar/calendars/calendar.history

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/tests/util

2010-06-05 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sat Jun  5 22:38:39 UTC 2010

Modified Files:
src/tests/util: Makefile
Added Files:
src/tests/util: t_sort.sh

Log Message:
Add a very basic test and some tests for the problem in PR 43358.

XXX: the sort tests in src/regress should be folded into this


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/util/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/t_sort.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/sets/lists/tests

2010-06-05 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sat Jun  5 22:39:19 UTC 2010

Modified Files:
src/distrib/sets/lists/tests: mi

Log Message:
+t_sort


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/tests/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.bin/sort

2010-06-05 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Sun Jun  6 00:00:33 UTC 2010

Modified Files:
src/usr.bin/sort: init.c

Log Message:
Fix typo in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/sort/init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.bin/make

2010-06-05 Thread Simon J. Gerraty
Module Name:src
Committed By:   sjg
Date:   Sun Jun  6 01:13:12 UTC 2010

Modified Files:
src/usr.bin/make: make.1 var.c

Log Message:
Add .export-env which tells make to export a variable to the environment
but not to track it - as is done for .export
This allows the variable to be updated without affecting what was put
into the environment.
Older versions of make will simply treat this as .export


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/usr.bin/make/make.1
cvs rdiff -u -r1.158 -r1.159 src/usr.bin/make/var.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/next68k/dev

2010-06-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jun  6 02:51:46 UTC 2010

Modified Files:
src/sys/arch/next68k/dev: nextdma.c

Log Message:
fix some errors in debug code, found by henning petersen in PR#42529.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/next68k/dev/nextdma.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/share/man/man4

2010-06-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jun  6 03:26:57 UTC 2010

Modified Files:
src/share/man/man4: ddb.4

Log Message:
note that sun2 has the same ddb mach commands as sun3/sun3x.  part of PR#38310


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/share/man/man4/ddb.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch

2010-06-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jun  6 03:34:14 UTC 2010

Modified Files:
src/sys/arch/sun2/sun2: db_machdep.c
src/sys/arch/sun3/sun3: db_machdep.c

Log Message:
implement ddb help for sun2/sun3 commands.  PR#38310 and PR#38308.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sun2/sun2/db_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sun3/sun3/db_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch

2010-06-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jun  6 04:50:08 UTC 2010

Modified Files:
src/sys/arch/amiga/amiga: amiga_init.c locore.s machdep.c trap.c
src/sys/arch/amiga/dev: bzivsc.c bzsc.c bztzsc.c cbiisc.c cbsc.c flsc.c
if_bah_zbus.c sbic.c
src/sys/arch/atari/atari: atari_init.c bus.c locore.s trap.c
src/sys/arch/cesfic/cesfic: locore.s trap.c
src/sys/arch/cesfic/include: cpu.h
src/sys/arch/hp300/dev: dma.c
src/sys/arch/hp300/hp300: locore.s trap.c
src/sys/arch/hp300/include: hp300spu.h
src/sys/arch/luna68k/luna68k: locore.s machdep.c pmap_bootstrap.c
trap.c
src/sys/arch/m68k/fpe: fpu_calcea.c
src/sys/arch/m68k/include: cacheops.h pmap_motorola.h
src/sys/arch/m68k/m68k: bus_dma.c cacheops.c copypage.s pmap_motorola.c
sig_machdep.c switch_subr.s sys_machdep.c
src/sys/arch/mac68k/mac68k: locore.s pmap_bootstrap.c trap.c
src/sys/arch/mvme68k/include: cpu.h
src/sys/arch/mvme68k/mvme68k: locore.s machdep.c pmap_bootstrap.c
trap.c
src/sys/arch/news68k/include: cpu.h
src/sys/arch/news68k/news68k: locore.s pmap_bootstrap.c trap.c
src/sys/arch/next68k/include: cpu.h
src/sys/arch/next68k/next68k: locore.s pmap_bootstrap.c trap.c
src/sys/arch/x68k/dev: intio_dmac.c
src/sys/arch/x68k/x68k: bus.c locore.s machdep.c pmap_bootstrap.c
trap.c

Log Message:
fix PR 6724 - convert m68k options to defflag's.  this means that
M680[12346] are now available from opt_m68k_arch.h.  FPSP meantioned
in the PR has already been fixed, and i could not find any more.

i built these kernels to ensure i did not break their builds:

amiga: GENERIC DRACO
atari: HADES FALCON MILAN-PCIIDE
mac68k: GENERIC
sun2: GENERIC
sun3: GENERIC GENERIC3X
cesfic: attempted GENERIC, does not build due to lack of machine/bus.h
hp300: GENERIC
luna68k: GENERIC
mvme68k: GENERIC
news68k: GENERIC
next68k: GENERIC
x68k: GENERIC


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/amiga/amiga/amiga_init.c
cvs rdiff -u -r1.149 -r1.150 src/sys/arch/amiga/amiga/locore.s
cvs rdiff -u -r1.225 -r1.226 src/sys/arch/amiga/amiga/machdep.c
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/amiga/amiga/trap.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amiga/dev/bzivsc.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/amiga/dev/bzsc.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amiga/dev/bztzsc.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amiga/dev/cbiisc.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amiga/dev/cbsc.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amiga/dev/flsc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amiga/dev/if_bah_zbus.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amiga/dev/sbic.c
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/atari/atari/bus.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/atari/atari/locore.s
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/atari/atari/trap.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/cesfic/cesfic/trap.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/cesfic/include/cpu.h
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hp300/dev/dma.c
cvs rdiff -u -r1.153 -r1.154 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/hp300/hp300/trap.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/include/hp300spu.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/luna68k/luna68k/machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/luna68k/luna68k/trap.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/m68k/fpe/fpu_calcea.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/m68k/include/cacheops.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/m68k/include/pmap_motorola.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/m68k/m68k/bus_dma.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/m68k/m68k/cacheops.c \
src/sys/arch/m68k/m68k/sys_machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/m68k/m68k/copypage.s
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/m68k/m68k/sig_machdep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/m68k/m68k/switch_subr.s
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/mac68k/mac68k/locore.s
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/mac68k/mac68k/pmap_bootstrap.c
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/mac68k/mac68k/trap.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/mvme68k/include/cpu.h
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/mvme68k/mvme68k/trap.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.53 -r1.54 src/sys/ar

CVS commit: src/tests/util/sh

2010-06-05 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sun Jun  6 04:51:13 UTC 2010

Modified Files:
src/tests/util/sh: t_set_e.sh

Log Message:
Document the changes in the previous version of this file. If we're
going to whitewash the test failures, we should at least keep track of
what the "real" correct behavior/output is. Especially since a large
portion of the tests in here were added specifically to illuminate
points at issue in prior discussions.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/util/sh/t_set_e.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/m68k/conf

2010-06-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jun  6 04:51:33 UTC 2010

Modified Files:
src/sys/arch/m68k/conf: files.m68k

Log Message:
fix PR 6724 - convert m68k options to defflag's.  this means that
M680[12346] are now available from opt_m68k_arch.h.  FPSP meantioned
in the PR has already been fixed, and i could not find any more.

i built these kernels to ensure i did not break their builds:

amiga: GENERIC DRACO
atari: HADES FALCON MILAN-PCIIDE
mac68k: GENERIC
sun2: GENERIC
sun3: GENERIC GENERIC3X
cesfic: attempted GENERIC, does not build due to lack of machine/bus.h
hp300: GENERIC
luna68k: GENERIC
mvme68k: GENERIC
news68k: GENERIC
next68k: GENERIC
x68k: GENERIC


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/m68k/conf/files.m68k

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/x68k

2010-06-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jun  6 04:52:01 UTC 2010

Modified Files:
src/sys/arch/x68k/conf: files.x68k
src/sys/arch/x68k/dev: fd.c
src/sys/arch/x68k/include: cpu.h

Log Message:
fix PR 6724 - convert m68k options to defflag's.  this means that
M680[12346] are now available from opt_m68k_arch.h.  FPSP meantioned
in the PR has already been fixed, and i could not find any more.

i built these kernels to ensure i did not break their builds:

amiga: GENERIC DRACO
atari: HADES FALCON MILAN-PCIIDE
mac68k: GENERIC
sun2: GENERIC
sun3: GENERIC GENERIC3X
cesfic: attempted GENERIC, does not build due to lack of machine/bus.h
hp300: GENERIC
luna68k: GENERIC
mvme68k: GENERIC
news68k: GENERIC
next68k: GENERIC
x68k: GENERIC


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/x68k/conf/files.x68k
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/x68k/dev/fd.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/x68k/include/cpu.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/mac68k

2010-06-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jun  6 04:52:17 UTC 2010

Modified Files:
src/sys/arch/mac68k/conf: files.mac68k
src/sys/arch/mac68k/dev: grf_compat.c

Log Message:
defflag GRF_COMPAT.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/mac68k/conf/files.mac68k
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mac68k/dev/grf_compat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/hpcmips/vr

2010-06-05 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sun Jun  6 06:10:03 UTC 2010

Modified Files:
src/sys/arch/hpcmips/vr: vr4181aiu.c

Log Message:
Add missing close-parenthesis; reported by Henning Petersen in PR 42526.
(HI CEGGER!)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcmips/vr/vr4181aiu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/hpcmips/tx

2010-06-05 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sun Jun  6 06:12:49 UTC 2010

Modified Files:
src/sys/arch/hpcmips/tx: tx39io.c

Log Message:
Add missing backslash in macro definition in apparently-disused #if branch.
(has been this way since 2001)
>From Henning Petersen in PR 42525.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hpcmips/tx/tx39io.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/kern

2010-06-05 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sun Jun  6 06:20:16 UTC 2010

Modified Files:
src/sys/kern: exec_elf.c

Log Message:
Improve previous: there were two printfs and I'd only noticed and fixed
one of them. PR 43217.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/kern/exec_elf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.