From: Takashi Iwai Subject: Re: [PATCH v4 17/79] include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP macro Date: Thu, 15 Oct 2015 10:04:47 +0200 Message-ID: References: <1444888618-4506-1-git-send-email-mikko.rapeli@iki.fi> <1444888618-4506-18-git-send-email-mikko.rapeli@iki.fi> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1444888618-4506-18-git-send-email-mikko.rapeli@iki.fi> Sender: linux-kernel-owner@vger.kernel.org To: Mikko Rapeli Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Jaroslav Kysela , linux-api@vger.kernel.org List-Id: alsa-devel@alsa-project.org On Thu, 15 Oct 2015 07:55:55 +0200, Mikko Rapeli wrote: >=20 > Fixes userspace compilation error: >=20 > error: expected specifier-qualifier-list before =E2=80=98DECLARE_BITM= AP=E2=80=99 > DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers = */ >=20 > DECLARE_BITMAP macro is not meant for userspace headers and thus > added here as private copy for emu10k.h. >=20 > Fix was suggested by Arnd Bergmann in message > <2168807.4Yxh5gl11Q@wuerfel> and Takashi Iwai > in message on lkml. >=20 > Signed-off-by: Mikko Rapeli Applied, thanks. Takashi > --- > include/uapi/sound/emu10k1.h | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) >=20 > diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k= 1.h > index ec1535b..5175e16 100644 > --- a/include/uapi/sound/emu10k1.h > +++ b/include/uapi/sound/emu10k1.h > @@ -34,6 +34,14 @@ > =20 > #define EMU10K1_FX8010_PCM_COUNT 8 > =20 > +/* > + * Following definition is copied from linux/types.h to support comp= iling > + * this header file in userspace since they are not generally availa= ble for > + * uapi headers. > + */ > +#define __EMU10K1_DECLARE_BITMAP(name,bits) \ > + unsigned long name[(bits) / (sizeof(unsigned long) * 8)] > + > /* instruction set */ > #define iMAC0 0x00 /* R =3D A + (X * Y >> 31) ; saturation */ > #define iMAC1 0x01 /* R =3D A + (-X * Y >> 31) ; saturation */ > @@ -300,7 +308,7 @@ struct snd_emu10k1_fx8010_control_old_gpr { > struct snd_emu10k1_fx8010_code { > char name[128]; > =20 > - DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers = */ > + __EMU10K1_DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid ini= tializers */ > __u32 __user *gpr_map; /* initializers */ > =20 > unsigned int gpr_add_control_count; /* count of GPR controls to add= /replace */ > @@ -313,11 +321,11 @@ struct snd_emu10k1_fx8010_code { > unsigned int gpr_list_control_total; /* total count of GPR controls= */ > struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /*= listed GPR controls */ > =20 > - DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers= */ > + __EMU10K1_DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid in= itializers */ > __u32 __user *tram_data_map; /* data initializers */ > __u32 __user *tram_addr_map; /* map initializers */ > =20 > - DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions = */ > + __EMU10K1_DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid ins= tructions */ > __u32 __user *code; /* one instruction - 64 bits */ > }; > =20 > --=20 > 2.5.0 >=20 >=20