CVS commit: src/sys/dev/ic

2019-06-13 Thread matthew green
Module Name:src Committed By: mrg Date: Fri Jun 14 04:48:34 UTC 2019 Modified Files: src/sys/dev/ic: nvme.c Log Message: in nvme_attach() when creating the admin queue to probe the device info, and also in nvme_dmamem_alloc(), allow as many DMA segment as would be

CVS commit: src/sys/dev/ic

2019-06-13 Thread matthew green
Module Name:src Committed By: mrg Date: Fri Jun 14 04:48:34 UTC 2019 Modified Files: src/sys/dev/ic: nvme.c Log Message: in nvme_attach() when creating the admin queue to probe the device info, and also in nvme_dmamem_alloc(), allow as many DMA segment as would be

CVS commit: src/sys/arch/x86/x86

2019-06-13 Thread matthew green
Module Name:src Committed By: mrg Date: Fri Jun 14 03:35:31 UTC 2019 Modified Files: src/sys/arch/x86/x86: bus_dma.c Log Message: KASSERT() -> KASSERTMSG() message in _bus_dmamem_alloc_range(). To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79

CVS commit: src/sys/arch/x86/x86

2019-06-13 Thread matthew green
Module Name:src Committed By: mrg Date: Fri Jun 14 03:35:31 UTC 2019 Modified Files: src/sys/arch/x86/x86: bus_dma.c Log Message: KASSERT() -> KASSERTMSG() message in _bus_dmamem_alloc_range(). To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79

CVS commit: src/usr.sbin/postinstall

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Fri Jun 14 01:54:16 UTC 2019 Modified Files: src/usr.sbin/postinstall: Makefile postinstall.in Log Message: make the script MI again (same across all archs) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3

CVS commit: src/usr.sbin/postinstall

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Fri Jun 14 01:54:16 UTC 2019 Modified Files: src/usr.sbin/postinstall: Makefile postinstall.in Log Message: make the script MI again (same across all archs) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3

CVS commit: src/usr.sbin/postinstall

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Fri Jun 14 01:06:33 UTC 2019 Modified Files: src/usr.sbin/postinstall: Makefile Added Files: src/usr.sbin/postinstall: postinstall.in Removed Files: src/usr.sbin/postinstall: postinstall Log Message: build

CVS commit: src/usr.sbin/postinstall

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Fri Jun 14 01:06:33 UTC 2019 Modified Files: src/usr.sbin/postinstall: Makefile Added Files: src/usr.sbin/postinstall: postinstall.in Removed Files: src/usr.sbin/postinstall: postinstall Log Message: build

CVS commit: src/external/gpl3/gdb/dist/gdb

2019-06-13 Thread Kamil Rytarowski
Module Name:src Committed By: kamil Date: Fri Jun 14 01:00:52 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: nbsd-nat.c Log Message: Enhance the GDB support for NetBSD - Enable VFORK events - Add syscall number for SCE/SCX events - Add commented out

CVS commit: src/external/gpl3/gdb/dist/gdb

2019-06-13 Thread Kamil Rytarowski
Module Name:src Committed By: kamil Date: Fri Jun 14 01:00:52 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: nbsd-nat.c Log Message: Enhance the GDB support for NetBSD - Enable VFORK events - Add syscall number for SCE/SCX events - Add commented out

re: CVS commit: src/usr.sbin/postinstall

2019-06-13 Thread matthew green
"Christos Zoulas" writes: > Module Name: src > Committed By: christos > Date: Thu Jun 13 21:20:05 UTC 2019 > > Modified Files: > src/usr.sbin/postinstall: postinstall > > Log Message: > remove obsolete library files for all the "compat" subdirs not just amd64 > and sparc64. i

CVS commit: src/usr.sbin/postinstall

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 21:20:05 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: remove obsolete library files for all the "compat" subdirs not just amd64 and sparc64. To generate a diff of this commit: cvs

CVS commit: src/usr.sbin/postinstall

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 21:20:05 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: remove obsolete library files for all the "compat" subdirs not just amd64 and sparc64. To generate a diff of this commit: cvs

CVS commit: src/compat

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 21:17:54 UTC 2019 Modified Files: src/compat: archdirs.mk Log Message: make all lines look the same, and put one arch per line. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/compat/archdirs.mk

CVS commit: src/compat

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 21:17:54 UTC 2019 Modified Files: src/compat: archdirs.mk Log Message: make all lines look the same, and put one arch per line. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/compat/archdirs.mk

CVS commit: src/etc

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 20:54:05 UTC 2019 Modified Files: src/etc: MAKEDEV.awk Log Message: Fix aarch64 To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/etc/MAKEDEV.awk Please note that diffs are not public domain; they

CVS commit: src/etc

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 20:54:05 UTC 2019 Modified Files: src/etc: MAKEDEV.awk Log Message: Fix aarch64 To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/etc/MAKEDEV.awk Please note that diffs are not public domain; they

CVS commit: src/usr.sbin/postinstall

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 20:53:33 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Anchor the egrep search to avoid npf.conf matching pf.conf, but don't anchor $ so that blacklistd machines blackist. To generate

CVS commit: src/usr.sbin/postinstall

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 20:53:33 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Anchor the egrep search to avoid npf.conf matching pf.conf, but don't anchor $ so that blacklistd machines blackist. To generate

CVS commit: src/tests/lib/libc/sys

2019-06-13 Thread Kamil Rytarowski
Module Name:src Committed By: kamil Date: Thu Jun 13 20:26:06 UTC 2019 Modified Files: src/tests/lib/libc/sys: t_ptrace_wait.c Log Message: Enable vfork(2) ATF tests in t_ptrace_wait* The racing issues are gone in my local setup. To generate a diff of this commit: cvs

CVS commit: src/tests/lib/libc/sys

2019-06-13 Thread Kamil Rytarowski
Module Name:src Committed By: kamil Date: Thu Jun 13 20:26:06 UTC 2019 Modified Files: src/tests/lib/libc/sys: t_ptrace_wait.c Log Message: Enable vfork(2) ATF tests in t_ptrace_wait* The racing issues are gone in my local setup. To generate a diff of this commit: cvs

CVS commit: src/sys/sys

2019-06-13 Thread Kamil Rytarowski
Module Name:src Committed By: kamil Date: Thu Jun 13 20:23:56 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Welcome to 8.99.45! struct lwp includes now l_vforkwaiting. To generate a diff of this commit: cvs rdiff -u -r1.592 -r1.593 src/sys/sys/param.h

CVS commit: src/sys/sys

2019-06-13 Thread Kamil Rytarowski
Module Name:src Committed By: kamil Date: Thu Jun 13 20:23:56 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Welcome to 8.99.45! struct lwp includes now l_vforkwaiting. To generate a diff of this commit: cvs rdiff -u -r1.592 -r1.593 src/sys/sys/param.h

CVS commit: src/sys

2019-06-13 Thread Kamil Rytarowski
Module Name:src Committed By: kamil Date: Thu Jun 13 20:20:18 UTC 2019 Modified Files: src/sys/kern: kern_exec.c kern_exit.c kern_fork.c src/sys/sys: lwp.h Log Message: Correct use-after-free issue in vfork(2) In the previous behavior vforking parent was keeping

CVS commit: src/sys

2019-06-13 Thread Kamil Rytarowski
Module Name:src Committed By: kamil Date: Thu Jun 13 20:20:18 UTC 2019 Modified Files: src/sys/kern: kern_exec.c kern_exit.c kern_fork.c src/sys/sys: lwp.h Log Message: Correct use-after-free issue in vfork(2) In the previous behavior vforking parent was keeping

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

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 19:37:36 UTC 2019 Modified Files: src/distrib/sets/lists/xdebug: shl.mi Log Message: fix eager sed that broke xorg_glamor. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50

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

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 19:37:36 UTC 2019 Modified Files: src/distrib/sets/lists/xdebug: shl.mi Log Message: fix eager sed that broke xorg_glamor. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50

CVS commit: src/usr.sbin/postinstall

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 19:30:30 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: 1. fix /etc/defaults/*.conf files a. there are more rc.conf.append arch than only for x86, deal with them too. b. populate

CVS commit: src/usr.sbin/postinstall

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 19:30:30 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: 1. fix /etc/defaults/*.conf files a. there are more rc.conf.append arch than only for x86, deal with them too. b. populate

CVS commit: src/usr.sbin/sysinst

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 19:13:05 UTC 2019 Modified Files: src/usr.sbin/sysinst: disks.c Log Message: Disable debug output To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/sysinst/disks.c Please note that diffs are

CVS commit: src/usr.sbin/sysinst

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 19:13:05 UTC 2019 Modified Files: src/usr.sbin/sysinst: disks.c Log Message: Disable debug output To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/sysinst/disks.c Please note that diffs are

CVS commit: src/sys/dev/pci

2019-06-13 Thread Maxime Villard
Module Name:src Committed By: maxv Date: Thu Jun 13 17:33:34 UTC 2019 Modified Files: src/sys/dev/pci: ehci_pci.c Log Message: Fix the error handling in ehci_pci_attach(): if we got a USB<2 device we won't call ehci_init(), so don't call ehci_detach() in

CVS commit: src/sys/dev/pci

2019-06-13 Thread Maxime Villard
Module Name:src Committed By: maxv Date: Thu Jun 13 17:33:34 UTC 2019 Modified Files: src/sys/dev/pci: ehci_pci.c Log Message: Fix the error handling in ehci_pci_attach(): if we got a USB<2 device we won't call ehci_init(), so don't call ehci_detach() in

CVS commit: src/sys/dev

2019-06-13 Thread Maxime Villard
Module Name:src Committed By: maxv Date: Thu Jun 13 17:20:25 UTC 2019 Modified Files: src/sys/dev/pci: ehci_pci.c src/sys/dev/usb: ehci.c Log Message: Random style in ehci, also KM_SLEEP does not fail. To generate a diff of this commit: cvs rdiff -u -r1.68

CVS commit: src/sys/dev

2019-06-13 Thread Maxime Villard
Module Name:src Committed By: maxv Date: Thu Jun 13 17:20:25 UTC 2019 Modified Files: src/sys/dev/pci: ehci_pci.c src/sys/dev/usb: ehci.c Log Message: Random style in ehci, also KM_SLEEP does not fail. To generate a diff of this commit: cvs rdiff -u -r1.68

CVS commit: src/sys/arch/x86/include

2019-06-13 Thread SAITOH Masanobu
Module Name:src Committed By: msaitoh Date: Thu Jun 13 15:10:27 UTC 2019 Modified Files: src/sys/arch/x86/include: i82489reg.h Log Message: Indent consistently. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18

CVS commit: src/sys/arch/x86/include

2019-06-13 Thread SAITOH Masanobu
Module Name:src Committed By: msaitoh Date: Thu Jun 13 15:10:27 UTC 2019 Modified Files: src/sys/arch/x86/include: i82489reg.h Log Message: Indent consistently. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18

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

2019-06-13 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Thu Jun 13 13:37:56 UTC 2019 Modified Files: src/distrib/sets/lists/xdebug: md.alpha md.amd64 md.amiga md.bebox md.cats md.dreamcast md.evbarm md.evbarm.armeb md.evbmips md.ews4800mips md.hp300 md.hpcarm

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

2019-06-13 Thread Jared D. McNeill
Module Name:src Committed By: jmcneill Date: Thu Jun 13 13:35:41 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC GENERIC64 Log Message: add ahcisata at pci To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/GENERIC cvs

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

2019-06-13 Thread Jared D. McNeill
Module Name:src Committed By: jmcneill Date: Thu Jun 13 13:35:41 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC GENERIC64 Log Message: add ahcisata at pci To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/GENERIC cvs

CVS commit: src/usr.sbin/sysinst

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 12:44:20 UTC 2019 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: When merging existing partitions into our install description, mark them as to-be-mounted. To generate a diff of this commit: cvs

CVS commit: src/usr.sbin/sysinst

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 12:44:20 UTC 2019 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: When merging existing partitions into our install description, mark them as to-be-mounted. To generate a diff of this commit: cvs

CVS commit: src/usr.sbin/sysinst

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 12:31:28 UTC 2019 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: Do not use dynamic size adjustments on install descriptions based on existing partitions - we need to keep them fixed to not confuse

CVS commit: src/usr.sbin/sysinst

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 12:31:28 UTC 2019 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: Do not use dynamic size adjustments on install descriptions based on existing partitions - we need to keep them fixed to not confuse

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

2019-06-13 Thread Yuuki Enomoto
Module Name:src Committed By: uki Date: Thu Jun 13 12:01:20 UTC 2019 Modified Files: src/distrib/sets/lists/xbase: md.amd64 md.evbarm md.i386 Log Message: Package naming to xbase md files To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18

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

2019-06-13 Thread Yuuki Enomoto
Module Name:src Committed By: uki Date: Thu Jun 13 12:01:20 UTC 2019 Modified Files: src/distrib/sets/lists/xbase: md.amd64 md.evbarm md.i386 Log Message: Package naming to xbase md files To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18

CVS commit: src/usr.sbin/sysinst/arch

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 09:36:56 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/arc: md.c src/usr.sbin/sysinst/arch/bebox: md.c src/usr.sbin/sysinst/arch/cobalt: md.c src/usr.sbin/sysinst/arch/evbarm: md.c

CVS commit: src/usr.sbin/sysinst/arch

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 09:36:56 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/arc: md.c src/usr.sbin/sysinst/arch/bebox: md.c src/usr.sbin/sysinst/arch/cobalt: md.c src/usr.sbin/sysinst/arch/evbarm: md.c

CVS commit: src/sys/arch/x86/include

2019-06-13 Thread SAITOH Masanobu
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:44:27 UTC 2019 Modified Files: src/sys/arch/x86/include: i82489reg.h Log Message: Modify LAPIC_LVT_CMCI's comment to be consistent with other LVT's. No functional change. To generate a diff of this commit: cvs

CVS commit: src/sys/arch/x86/include

2019-06-13 Thread SAITOH Masanobu
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:44:27 UTC 2019 Modified Files: src/sys/arch/x86/include: i82489reg.h Log Message: Modify LAPIC_LVT_CMCI's comment to be consistent with other LVT's. No functional change. To generate a diff of this commit: cvs

CVS commit: src/sys/arch/x86/x86

2019-06-13 Thread SAITOH Masanobu
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:42:45 UTC 2019 Modified Files: src/sys/arch/x86/x86: lapic.c Log Message: lapic_dump(): Print CMCI and thermal local vector table, too. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73

CVS commit: src/sys/arch/x86/x86

2019-06-13 Thread SAITOH Masanobu
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:42:45 UTC 2019 Modified Files: src/sys/arch/x86/x86: lapic.c Log Message: lapic_dump(): Print CMCI and thermal local vector table, too. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73

CVS commit: src/sys/arch/x86/x86

2019-06-13 Thread SAITOH Masanobu
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:28:17 UTC 2019 Modified Files: src/sys/arch/x86/x86: apic.c ioapic.c Log Message: Whitespace fix. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/x86/apic.c cvs

CVS commit: src/sys/arch/x86/x86

2019-06-13 Thread SAITOH Masanobu
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:28:17 UTC 2019 Modified Files: src/sys/arch/x86/x86: apic.c ioapic.c Log Message: Whitespace fix. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/x86/apic.c cvs

CVS commit: src/usr.sbin/sysinst/arch

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 06:34:31 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/acorn32: Makefile src/usr.sbin/sysinst/arch/emips: Makefile src/usr.sbin/sysinst/arch/ews4800mips: Makefile Log Message: Remove GPT and

CVS commit: src/usr.sbin/sysinst/arch

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 06:34:31 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/acorn32: Makefile src/usr.sbin/sysinst/arch/emips: Makefile src/usr.sbin/sysinst/arch/ews4800mips: Makefile Log Message: Remove GPT and

CVS commit: src/usr.sbin/sysinst/arch/sparc64

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 06:25:03 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/sparc64: md.h Log Message: Remove GPT boot (not available for sparc64 yet) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4

CVS commit: src/usr.sbin/sysinst/arch/sparc64

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 06:25:03 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/sparc64: md.h Log Message: Remove GPT boot (not available for sparc64 yet) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4

CVS commit: src/usr.sbin/sysinst

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 06:20:35 UTC 2019 Modified Files: src/usr.sbin/sysinst: disklabel.c Log Message: Fix unitialized variable To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/disklabel.c Please note that

CVS commit: src/usr.sbin/sysinst

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 06:20:35 UTC 2019 Modified Files: src/usr.sbin/sysinst: disklabel.c Log Message: Fix unitialized variable To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/disklabel.c Please note that

CVS commit: [netbsd-8] src/sys

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 06:12:55 UTC 2019 Modified Files: src/sys/arch/x86/x86 [netbsd-8]: hypervvar.h src/sys/dev/hyperv [netbsd-8]: genfb_vmbus.c genfb_vmbusvar.h hvkbd.c Log Message: Ooops, fix misaplied patch from ticket #1281

CVS commit: [netbsd-8] src/sys

2019-06-13 Thread Martin Husemann
Module Name:src Committed By: martin Date: Thu Jun 13 06:12:55 UTC 2019 Modified Files: src/sys/arch/x86/x86 [netbsd-8]: hypervvar.h src/sys/dev/hyperv [netbsd-8]: genfb_vmbus.c genfb_vmbusvar.h hvkbd.c Log Message: Ooops, fix misaplied patch from ticket #1281