svn commit: r260121 - head/sys/dev/nand

2013-12-30 Thread Warner Losh
Author: imp Date: Tue Dec 31 07:36:39 2013 New Revision: 260121 URL: http://svnweb.freebsd.org/changeset/base/260121 Log: Add support for Samsung K9F2G08U0A (256MiB SLC) NAND found on some old Atmel boards I have. # All Samsung, Toshiba and SanDisk parts will need to be in this table #

svn commit: r260120 - stable/10/sys/contrib/dev/run

2013-12-30 Thread Kevin Lo
Author: kevlo Date: Tue Dec 31 05:20:44 2013 New Revision: 260120 URL: http://svnweb.freebsd.org/changeset/base/260120 Log: MFC r256717: Update firmware for run(4) to version 0.33. Modified: stable/10/sys/contrib/dev/run/rt2870.fw.uu Directory Properties: stable/10/ (props changed)

svn commit: r260119 - stable/9/sys/contrib/dev/run

2013-12-30 Thread Kevin Lo
Author: kevlo Date: Tue Dec 31 05:15:29 2013 New Revision: 260119 URL: http://svnweb.freebsd.org/changeset/base/260119 Log: MFC r256717: Update firmware for run(4) to version 0.33. Modified: stable/9/sys/contrib/dev/run/rt2870.fw.uu Directory Properties: stable/9/sys/contrib/dev/run/

svn commit: r260118 - head/sys/kern

2013-12-30 Thread Warner Losh
Author: imp Date: Tue Dec 31 04:40:25 2013 New Revision: 260118 URL: http://svnweb.freebsd.org/changeset/base/260118 Log: Delete echoed doesn't rub out the previous character, so always useinstead. This fixes hitting DELETE instead of BACKSPACE at mountroot> prompt. Modified: head/sys

Re: svn commit: r260091 - in head/sys/cddl: contrib/opensolaris/uts/common/dtrace contrib/opensolaris/uts/common/sys dev/dtrace

2013-12-30 Thread Mark Johnston
On Mon, Dec 30, 2013 at 10:49:23PM -0500, Pedro Giffuni wrote: > > Il giorno 30/dic/2013, alle ore 22:28, Mark Johnston ha > scritto: > > > On Mon, Dec 30, 2013 at 10:21:58PM -0500, Pedro Giffuni wrote: > >> > >> Il giorno 30/dic/2013, alle ore 21:40, Mark Johnston > >> ha scritto: > >> > >

Re: svn commit: r260091 - in head/sys/cddl: contrib/opensolaris/uts/common/dtrace contrib/opensolaris/uts/common/sys dev/dtrace

2013-12-30 Thread Pedro Giffuni
Il giorno 30/dic/2013, alle ore 22:28, Mark Johnston ha scritto: > On Mon, Dec 30, 2013 at 10:21:58PM -0500, Pedro Giffuni wrote: >> >> Il giorno 30/dic/2013, alle ore 21:40, Mark Johnston ha >> scritto: >> >>> On Tue, Dec 31, 2013 at 12:42:10AM +0400, Gleb Smirnoff wrote: On Mon, Dec

Re: svn commit: r260091 - in head/sys/cddl: contrib/opensolaris/uts/common/dtrace contrib/opensolaris/uts/common/sys dev/dtrace

2013-12-30 Thread Mark Johnston
On Mon, Dec 30, 2013 at 10:21:58PM -0500, Pedro Giffuni wrote: > > Il giorno 30/dic/2013, alle ore 21:40, Mark Johnston ha > scritto: > > > On Tue, Dec 31, 2013 at 12:42:10AM +0400, Gleb Smirnoff wrote: > >> On Mon, Dec 30, 2013 at 05:37:32PM +, Mark Johnston wrote: > >> M> Author: markj >

Re: svn commit: r260091 - in head/sys/cddl: contrib/opensolaris/uts/common/dtrace contrib/opensolaris/uts/common/sys dev/dtrace

2013-12-30 Thread Pedro Giffuni
Il giorno 30/dic/2013, alle ore 21:40, Mark Johnston ha scritto: > On Tue, Dec 31, 2013 at 12:42:10AM +0400, Gleb Smirnoff wrote: >> On Mon, Dec 30, 2013 at 05:37:32PM +, Mark Johnston wrote: >> M> Author: markj >> M> Date: Mon Dec 30 17:37:32 2013 >> M> New Revision: 260091 >> M> URL: http

Re: svn commit: r260091 - in head/sys/cddl: contrib/opensolaris/uts/common/dtrace contrib/opensolaris/uts/common/sys dev/dtrace

2013-12-30 Thread Mark Johnston
On Tue, Dec 31, 2013 at 12:42:10AM +0400, Gleb Smirnoff wrote: > On Mon, Dec 30, 2013 at 05:37:32PM +, Mark Johnston wrote: > M> Author: markj > M> Date: Mon Dec 30 17:37:32 2013 > M> New Revision: 260091 > M> URL: http://svnweb.freebsd.org/changeset/base/260091 > M> > M> Log: > M> Now that

svn commit: r260115 - stable/9/release

2013-12-30 Thread Glen Barber
Author: gjb Date: Tue Dec 31 00:21:15 2013 New Revision: 260115 URL: http://svnweb.freebsd.org/changeset/base/260115 Log: Revert r259862: Don't try to bootstrap a utility that does not exist in the branch. Pointyhat: gjb Submitted by: John W. O'Brien (via -stable@) Sponsored by

Re: svn commit: r260114 - stable/10/sys/dev/bxe

2013-12-30 Thread Eric Davis
On Mon, Dec 30, 2013 at 04:07:39PM -0800, hiren panchasara wrote: > On Mon, Dec 30, 2013 at 3:46 PM, Eric Davis wrote: > > Author: edavis > > Date: Mon Dec 30 23:46:35 2013 > > New Revision: 260114 > > URL: http://svnweb.freebsd.org/changeset/base/260114 > > > > Log: > > Approved by: re@ (gjb)

Re: svn commit: r260114 - stable/10/sys/dev/bxe

2013-12-30 Thread Glen Barber
On Mon, Dec 30, 2013 at 11:46:35PM +, Eric Davis wrote: > Author: edavis > Date: Mon Dec 30 23:46:35 2013 > New Revision: 260114 > URL: http://svnweb.freebsd.org/changeset/base/260114 > > Log: > Approved by:re@ (gjb) > Approved by:davidch (mentor) It was not approved by re

Re: svn commit: r260114 - stable/10/sys/dev/bxe

2013-12-30 Thread hiren panchasara
On Mon, Dec 30, 2013 at 3:46 PM, Eric Davis wrote: > Author: edavis > Date: Mon Dec 30 23:46:35 2013 > New Revision: 260114 > URL: http://svnweb.freebsd.org/changeset/base/260114 > > Log: > Approved by: re@ (gjb) > Approved by: davidch (mentor) Missed the commit-log message? :-) cheers, Hi

svn commit: r260114 - stable/10/sys/dev/bxe

2013-12-30 Thread Eric Davis
Author: edavis Date: Mon Dec 30 23:46:35 2013 New Revision: 260114 URL: http://svnweb.freebsd.org/changeset/base/260114 Log: Approved by: re@ (gjb) Approved by: davidch (mentor) Modified: stable/10/sys/dev/bxe/bxe.c stable/10/sys/dev/bxe/ecore_sp.c Directory Properties: stable/10/ (

svn commit: r260113 - head/sys/dev/bxe

2013-12-30 Thread Eric Davis
Author: edavis Date: Mon Dec 30 23:02:26 2013 New Revision: 260113 URL: http://svnweb.freebsd.org/changeset/base/260113 Log: For TSO, when the first mbuf contains both the packet header and data, the header is split out into its own BD for processing by the firmware. When this split occurred

Re: svn commit: r260097 - in head/sys: nfs rpc

2013-12-30 Thread Alexander Motin
On 31.12.2013 00:23, Adrian Chadd wrote: Hm, this kind of per-bucket hash table may end up wanting to be used in a variety of places. I wonder if we should create a locked hash table type to reuse in various laces. I don't see there enough of reuse to create KPI for it. IMHO existing hashinit(

Re: svn commit: r260097 - in head/sys: nfs rpc

2013-12-30 Thread Adrian Chadd
Hm, this kind of per-bucket hash table may end up wanting to be used in a variety of places. I wonder if we should create a locked hash table type to reuse in various laces. Nice work though. I wonder about doing this elsewhere (eg inpcb hash, kqueue hash, etc.) -a On 30 December 2013 12:23,

svn commit: r260112 - head/sys/dev/sound/pci

2013-12-30 Thread Dimitry Andric
Author: dim Date: Mon Dec 30 22:17:33 2013 New Revision: 260112 URL: http://svnweb.freebsd.org/changeset/base/260112 Log: In sys/dev/sound/pci/maestro.c, #if 0 two unused static functions. MFC after:3 days Modified: head/sys/dev/sound/pci/maestro.c Modified: head/sys/dev/sound/pci/m

svn commit: r260111 - in head/sys: conf modules/mlx4

2013-12-30 Thread Dimitry Andric
Author: dim Date: Mon Dec 30 22:14:31 2013 New Revision: 260111 URL: http://svnweb.freebsd.org/changeset/base/260111 Log: For sys/ofed/drivers/infiniband/hw/mlx4/mcg.c, disable warning about unused variables for now. MFC after:3 days Modified: head/sys/conf/files head/sys/modules

svn commit: r260110 - head/sys/dev/oce

2013-12-30 Thread Xin LI
Author: delphij Date: Mon Dec 30 21:30:49 2013 New Revision: 260110 URL: http://svnweb.freebsd.org/changeset/base/260110 Log: Eliminate unused drbr_stats_update implementation in oce(4) driver. Noticed by: dim MFC after:2 weeks Modified: head/sys/dev/oce/oce_if.c Modified: head/

svn commit: r260109 - stable/10/sys/fs/nfsclient

2013-12-30 Thread Rick Macklem
Author: rmacklem Date: Mon Dec 30 21:24:41 2013 New Revision: 260109 URL: http://svnweb.freebsd.org/changeset/base/260109 Log: MFC: r259771 The NFSv4.1 client didn't return NFSv4.1 specific error codes for the Getattr and Recall callbacks. This patch fixes it. Since the NFSv4.1 specific er

svn commit: r260108 - stable/10/sbin/mount_nfs

2013-12-30 Thread Rick Macklem
Author: rmacklem Date: Mon Dec 30 21:20:51 2013 New Revision: 260108 URL: http://svnweb.freebsd.org/changeset/base/260108 Log: MFC: r259089 Document the noncontigwr NFS mount option. This is a content change. Modified: stable/10/sbin/mount_nfs/mount_nfs.8 Directory Properties: stable/10

svn commit: r260107 - in stable/10/sys: fs/nfsclient nfsclient

2013-12-30 Thread Rick Macklem
Author: rmacklem Date: Mon Dec 30 21:17:20 2013 New Revision: 260107 URL: http://svnweb.freebsd.org/changeset/base/260107 Log: MFC: r259084 For software builds, the NFS client does many small synchronous (with FILE_SYNC) writes because non-contiguous byte ranges in the same buffer cache bl

svn commit: r260106 - head/usr.bin/iscsictl

2013-12-30 Thread Edward Tomasz Napierala
Author: trasz Date: Mon Dec 30 21:06:08 2013 New Revision: 260106 URL: http://svnweb.freebsd.org/changeset/base/260106 Log: The devd part never got implemented; remove for now, until someone actually needs this feature and can talk to me about how it should look like. MFC after:3 days

svn commit: r260105 - head/usr.bin/iscsictl

2013-12-30 Thread Edward Tomasz Napierala
Author: trasz Date: Mon Dec 30 21:04:24 2013 New Revision: 260105 URL: http://svnweb.freebsd.org/changeset/base/260105 Log: Fix typo. MFC after:3 days Sponsored by: The FreeBSD Foundation Modified: head/usr.bin/iscsictl/iscsictl.8 Modified: head/usr.bin/iscsictl/iscsictl.8 ===

svn commit: r260104 - in head/sys: conf modules/ibcore

2013-12-30 Thread Dimitry Andric
Author: dim Date: Mon Dec 30 20:58:06 2013 New Revision: 260104 URL: http://svnweb.freebsd.org/changeset/base/260104 Log: For sys/ofed/drivers/infiniband/core/cm.c, disable warning about unused functions for now. MFC after:3 days Modified: head/sys/conf/files head/sys/modules/ibc

Re: svn commit: r260091 - in head/sys/cddl: contrib/opensolaris/uts/common/dtrace contrib/opensolaris/uts/common/sys dev/dtrace

2013-12-30 Thread Gleb Smirnoff
On Mon, Dec 30, 2013 at 05:37:32PM +, Mark Johnston wrote: M> Author: markj M> Date: Mon Dec 30 17:37:32 2013 M> New Revision: 260091 M> URL: http://svnweb.freebsd.org/changeset/base/260091 M> M> Log: M> Now that vmem(9) is available, use vmem arenas to allocate probe and M> aggregation ID

svn commit: r260103 - head/sys/amd64/amd64

2013-12-30 Thread Dimitry Andric
Author: dim Date: Mon Dec 30 20:37:47 2013 New Revision: 260103 URL: http://svnweb.freebsd.org/changeset/base/260103 Log: In sys/amd64/amd64/pmap.c, remove static function pmap_is_current(), which has been unused since r189415. Reviewed by: alc MFC after:3 days Modified: head/sy

svn commit: r260102 - in head/sys: conf modules/drm2/radeonkms modules/ibcore modules/ipoib modules/mlx4 modules/mlx4ib modules/mlxen modules/mthca ofed/drivers/infiniband/hw/mlx4 ofed/drivers/net/...

2013-12-30 Thread Dimitry Andric
Author: dim Date: Mon Dec 30 20:34:53 2013 New Revision: 260102 URL: http://svnweb.freebsd.org/changeset/base/260102 Log: Similar to r260020, only use -fms-extensions with gcc, for all other modules which require this flag to compile. Use a GCC_MS_EXTENSIONS variable, defined in kern.pre.mk

svn commit: r260101 - stable/10/sys/dev/bxe

2013-12-30 Thread Dimitry Andric
Author: dim Date: Mon Dec 30 20:32:27 2013 New Revision: 260101 URL: http://svnweb.freebsd.org/changeset/base/260101 Log: MFC r259928: In sys/dev/bxe/bxe.c, remove static function bxe_has_tx_work_unload(), which has never been used. Reviewed by: edavis Modified: stable/10/sys/dev

svn commit: r260100 - in stable: 10/sys/dev/drm 9/sys/dev/drm

2013-12-30 Thread Dimitry Andric
Author: dim Date: Mon Dec 30 20:27:58 2013 New Revision: 260100 URL: http://svnweb.freebsd.org/changeset/base/260100 Log: MFC r259902: In sys/dev/drm/mach64_dma.c, remove static function mach64_set_dma_eol(), which has never been used, even by upstream, since its initial upstream commit

svn commit: r260100 - in stable: 10/sys/dev/drm 9/sys/dev/drm

2013-12-30 Thread Dimitry Andric
Author: dim Date: Mon Dec 30 20:27:58 2013 New Revision: 260100 URL: http://svnweb.freebsd.org/changeset/base/260100 Log: MFC r259902: In sys/dev/drm/mach64_dma.c, remove static function mach64_set_dma_eol(), which has never been used, even by upstream, since its initial upstream commit

svn commit: r260099 - head/contrib/gcc

2013-12-30 Thread Pedro F. Giffuni
Author: pfg Date: Mon Dec 30 20:24:05 2013 New Revision: 260099 URL: http://svnweb.freebsd.org/changeset/base/260099 Log: gcc: Fix issue with "unavailable" attribute. While here, point where we dropped the support for objc from r260014. MFC after:3 weeks Modified: head/contrib/g

svn commit: r260097 - in head/sys: nfs rpc

2013-12-30 Thread Alexander Motin
Author: mav Date: Mon Dec 30 20:23:15 2013 New Revision: 260097 URL: http://svnweb.freebsd.org/changeset/base/260097 Log: Move most of NFS file handle affinity code out of the heavily congested global RPC thread pool lock and protect it with own set of locks. On synthetic benchmarks this

svn commit: r260096 - in stable: 10/gnu/lib/csu 10/gnu/lib/libgcc 10/gnu/lib/libstdc++ 10/gnu/lib/libsupc++ 10/lib/atf/libatf-c/tests 10/lib/libstand 10/share/mk 10/sys/boot/ficl 10/sys/boot/i386 1...

2013-12-30 Thread Dimitry Andric
Author: dim Date: Mon Dec 30 20:15:46 2013 New Revision: 260096 URL: http://svnweb.freebsd.org/changeset/base/260096 Log: MFC r257532 (by adrian): Fix this build for clang. MFC r259730: To avoid having to explicitly test COMPILER_TYPE for setting clang-specific or gcc-specific f

svn commit: r260096 - in stable: 10/gnu/lib/csu 10/gnu/lib/libgcc 10/gnu/lib/libstdc++ 10/gnu/lib/libsupc++ 10/lib/atf/libatf-c/tests 10/lib/libstand 10/share/mk 10/sys/boot/ficl 10/sys/boot/i386 1...

2013-12-30 Thread Dimitry Andric
Author: dim Date: Mon Dec 30 20:15:46 2013 New Revision: 260096 URL: http://svnweb.freebsd.org/changeset/base/260096 Log: MFC r257532 (by adrian): Fix this build for clang. MFC r259730: To avoid having to explicitly test COMPILER_TYPE for setting clang-specific or gcc-specific f

svn commit: r260095 - in head/sys/boot: i386 i386/boot2 i386/gptboot i386/gptzfsboot i386/zfsboot pc98/boot2

2013-12-30 Thread Dimitry Andric
Author: dim Date: Mon Dec 30 19:05:50 2013 New Revision: 260095 URL: http://svnweb.freebsd.org/changeset/base/260095 Log: For sys/boot/i386 and sys/boot/pc98, separate flags to be passed directly to the linker (LD_FLAGS) from flags passed indirectly, via the compiler driver (LDFLAGS). T

svn commit: r260094 - releng/10.0/release/doc/en_US.ISO8859-1/relnotes

2013-12-30 Thread Glen Barber
Author: gjb Date: Mon Dec 30 18:42:09 2013 New Revision: 260094 URL: http://svnweb.freebsd.org/changeset/base/260094 Log: Add manual page entities needed for the -RELEASE build that do not exist in the doc/release/10.0.0/ tag. Approved by: re (implicit) Sponsored by: The FreeBSD Founda

svn commit: r260093 - head/sys/arm/at91

2013-12-30 Thread Warner Losh
Author: imp Date: Mon Dec 30 18:10:04 2013 New Revision: 260093 URL: http://svnweb.freebsd.org/changeset/base/260093 Log: Set the SoC name for the atmelbus name. Modified: head/sys/arm/at91/at91.c Modified: head/sys/arm/at91/at91.c

svn commit: r260092 - head/sys/conf

2013-12-30 Thread Warner Losh
Author: imp Date: Mon Dec 30 18:07:50 2013 New Revision: 260092 URL: http://svnweb.freebsd.org/changeset/base/260092 Log: Allow AT91_MCI_ALLOW_OVERCLOCK to be an option in kernel config files. Modified: head/sys/conf/options.arm Modified: head/sys/conf/options.arm ===

svn commit: r260091 - in head/sys/cddl: contrib/opensolaris/uts/common/dtrace contrib/opensolaris/uts/common/sys dev/dtrace

2013-12-30 Thread Mark Johnston
Author: markj Date: Mon Dec 30 17:37:32 2013 New Revision: 260091 URL: http://svnweb.freebsd.org/changeset/base/260091 Log: Now that vmem(9) is available, use vmem arenas to allocate probe and aggregation IDs, as is done in the upstream illumos code. This still requires some FreeBSD-specific

svn commit: r260089 - head/lib/msun/man

2013-12-30 Thread Steve Kargl
Author: kargl Date: Mon Dec 30 17:11:36 2013 New Revision: 260089 URL: http://svnweb.freebsd.org/changeset/base/260089 Log: Fix a mismerge of my local doc changes to msun/man/sinh.3. Modified: head/lib/msun/man/sinh.3 Modified: head/lib/msun/man/sinh.3 ===

svn commit: r260088 - head/sys/ufs/ffs

2013-12-30 Thread Kirk McKusick
Author: mckusick Date: Mon Dec 30 17:04:24 2013 New Revision: 260088 URL: http://svnweb.freebsd.org/changeset/base/260088 Log: Fine tune filesystem block allocations under low free-space conditions (-r254995) based on further operational experience. Submitted by: Dmitry Sivachenko Fix

svn commit: r260087 - head/sbin/camcontrol

2013-12-30 Thread Scott Long
Author: scottl Date: Mon Dec 30 16:49:31 2013 New Revision: 260087 URL: http://svnweb.freebsd.org/changeset/base/260087 Log: getopt returns an int, not a char, so use the correct data type for the return value. Fixes powerpc tinderbox. MFC after:2 days Modified: head/sbin/camcontro

svn commit: r260086 - head/sys/dev/iwn

2013-12-30 Thread Marius Strobl
Author: marius Date: Mon Dec 30 16:46:50 2013 New Revision: 260086 URL: http://svnweb.freebsd.org/changeset/base/260086 Log: - Probe with BUS_PROBE_DEFAULT instead of 0. - Remove clearing PCIM_CMD_INTxDIS; pci(4) will do that as appropriate since r189367. MFC after:1 week Modifie

svn commit: r260085 - stable/10/tools/build/mk

2013-12-30 Thread Julio Merino
Author: jmmv Date: Mon Dec 30 14:09:04 2013 New Revision: 260085 URL: http://svnweb.freebsd.org/changeset/base/260085 Log: Fix 'make check-old' warnings when WITHOUT_TESTS is set. This is a MFC of r258025 and r257940, both of which resolve issues with dynamically setting the list of obsol

Re: svn commit: r260082 - stable/9/sys/vm

2013-12-30 Thread Konstantin Belousov
On Mon, Dec 30, 2013 at 02:20:31PM +0100, Mathieu Arnold wrote: > Hi, > > Would you mind committing that on stable/8 too ? The bug must be there too. I have no stable/8 systems. If somebody tests the patch there, I might consider the merge. pgpLymI1q0Edo.pgp Description: PGP signature

Re: svn commit: r260082 - stable/9/sys/vm

2013-12-30 Thread Mathieu Arnold
Hi, Would you mind committing that on stable/8 too ? The bug must be there too. +--On 30 décembre 2013 09:04:06 + Konstantin Belousov wrote: | Author: kib | Date: Mon Dec 30 09:04:06 2013 | New Revision: 260082 | URL: http://svnweb.freebsd.org/changeset/base/260082 | | Log: | MFC r259951:

svn commit: r260084 - in stable/10/share/man: man5 man7 man8

2013-12-30 Thread Sergey Kandaurov
Author: pluknet Date: Mon Dec 30 13:05:19 2013 New Revision: 260084 URL: http://svnweb.freebsd.org/changeset/base/260084 Log: MFC r259879: Clean up manual pages after BIND removal. Modified: stable/10/share/man/man5/hosts.5 stable/10/share/man/man5/hosts.equiv.5 stable/10/share/man/man5/n

svn commit: r260083 - head/sys/dev/iscsi

2013-12-30 Thread Edward Tomasz Napierala
Author: trasz Date: Mon Dec 30 12:18:06 2013 New Revision: 260083 URL: http://svnweb.freebsd.org/changeset/base/260083 Log: Fix extremely slow operation with data digests enabled. This was caused by receive code waiting for data digest even when the data segment was empty. It didn't actual

svn commit: r260082 - stable/9/sys/vm

2013-12-30 Thread Konstantin Belousov
Author: kib Date: Mon Dec 30 09:04:06 2013 New Revision: 260082 URL: http://svnweb.freebsd.org/changeset/base/260082 Log: MFC r259951: Do not coalesce stack entry. Pass MAP_STACK_GROWS_DOWN and MAP_STACK_GROWS_UP flags to vm_map_insert() from vm_map_stack() Modified: stable/9/sys/vm/vm_ma

svn commit: r260081 - stable/10/sys/vm

2013-12-30 Thread Konstantin Belousov
Author: kib Date: Mon Dec 30 08:57:54 2013 New Revision: 260081 URL: http://svnweb.freebsd.org/changeset/base/260081 Log: MFC r259951: Do not coalesce stack entry. Pass MAP_STACK_GROWS_DOWN and MAP_STACK_GROWS_UP flags to vm_map_insert() from vm_map_stack() Modified: stable/10/sys/vm/vm_m

svn commit: r260080 - head/sys

2013-12-30 Thread Rui Paulo
Author: rpaulo Date: Mon Dec 30 08:36:17 2013 New Revision: 260080 URL: http://svnweb.freebsd.org/changeset/base/260080 Log: Add netpfil to CSCOPEDIRS. Modified: head/sys/Makefile Modified: head/sys/Makefile == --- h