SVN r257228 breaks kernel build with gcc

[Michael Butler]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 10/28/13 17:15, Konstantin Belousov wrote:
> On Mon, Oct 28, 2013 at 04:53:10PM -0400, Michael Butler wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> That is ..
>>
>> - --- busdma_bounce.o ---
>> cc1: warnings being treated as errors
>> In file included from /usr/src/sys/x86/x86/busdma_bounce.c:54:
>> /usr/src/sys/x86/include/busdma_impl.h:85: warning: redundant
>> redeclaration of 'busdma_lock_mutex' [-Wredundant-decls]
>> /usr/src/sys/sys/bus_dma.h:150: warning: previous declaration of
>> 'busdma_lock_mutex' was here
>> *** [busdma_bounce.o] Error code 1
> 
> Does the following patch allow you to successfully build the kernel with
> gcc, or is there more issues left ?
> 
> diff --git a/sys/x86/include/busdma_impl.h b/sys/x86/include/busdma_impl.h
> index 70c9a6f..b851e7a 100644
> --- a/sys/x86/include/busdma_impl.h
> +++ b/sys/x86/include/busdma_impl.h
> @@ -82,7 +82,6 @@ struct bus_dma_impl {
>  	    bus_dmasync_op_t op);
>  };
>  
> -void busdma_lock_mutex(void *arg, bus_dma_lock_op_t op);
>  void bus_dma_dflt_lock(void *arg, bus_dma_lock_op_t op);
>  int bus_dma_run_filter(struct bus_dma_tag_common *dmat, bus_addr_t paddr);
>  int common_bus_dma_tag_create(struct bus_dma_tag_common *parent,
> 

This fixes it - thanks! :-)

	imb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (FreeBSD)

iEYEARECAAYFAlJu9EgACgkQQv9rrgRC1JIt3QCgi9bYP7VRxcJKh3BpxEFvu/r6
1igAoJ0fUja3x5F/I1XXGuxkdNi4mm62
=FEB0
-----END PGP SIGNATURE-----