Rel. 11.3: Kernel doesn't compile anymore (SVN-334762, please fix!)

[Hans Petter Selasky]

Hi Allan,

Can ZFS use atomic_add_64() in the kernel for i386 instead of building 
its own variant?

--HPS

On 2019-07-25 13:13, Peter wrote:
> Hi Hans Petter,
>   glad to read You! :)
>   
> On Thu, Jul 25, 2019 at 09:39:26AM +0200, Hans Petter Selasky wrote:
> ! On 2019-07-25 01:00, Peter wrote:
> 
> ! >> The offending feature is either
> ! >>     options ZFS
> ! >> or
> ! >>     device dtrace
> ! >> (Adding any of these to the GENERIC config gives the same error.)
> 
> ! Can you attach your kernel configuration file?
> 
> Yes, but to what point?
> I can reproduce this with the GENERIC configuration by adding
>    "options ZFS"
> 
> (My custom KERNCONF relates to my local patches, and is rather
> pointless without these. So at first I tried to reproduce without
> my local patches and with minimal changes from GENERIC config. And
> the minimal change is to add "options ZFS" into the GENERIC conf.)
> 
> See here:
> 
> root at disp:/usr/src/sys/i386/compile/GENERIC # make
> linking kernel.full
> atomic.o: In function `atomic_add_64':
> /usr/src/sys/i386/compile/GENERIC/./machine/atomic.h:629: multiple definition of `atomic_add_64'
> opensolaris_atomic.o:/usr/src/sys/i386/compile/GENERIC/../../../cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S:71: first defined here
> *** Error code 1
> 
> Stop.
> make: stopped in /usr/src/sys/i386/compile/GENERIC
> root at disp:/usr/src/sys/i386/compile/GENERIC #
> 
> root at disp:/usr/src/sys/i386/compile/GENERIC # cd ../../../..
> root at disp:/usr/src # svn stat
> M       sys/i386/conf/GENERIC
> root at disp:/usr/src # svn diff
> Index: sys/i386/conf/GENERIC
> ===================================================================
> --- sys/i386/conf/GENERIC       (revision 350287)
> +++ sys/i386/conf/GENERIC       (working copy)
> @@ -1,3 +1,4 @@
> +options ZFS
>   #
>   # GENERIC -- Generic kernel configuration file for FreeBSD/i386
>   #
> 
> root at disp:/usr/src # svn info
> Path: .
> Working Copy Root Path: /usr/src
> URL: https://svn0.us-east.freebsd.org/base/releng/11.3
> Relative URL: ^/releng/11.3
> Repository Root: https://svn0.us-east.freebsd.org/base
> Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
> Revision: 350287
> Node Kind: directory
> Schedule: normal
> Last Changed Author: gordon
> Last Changed Rev: 350287
> Last Changed Date: 2019-07-24 12:58:21 +0000 (Wed, 24 Jul 2019)
> 
> 
>