Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752824AbbBPXIM (ORCPT ); Mon, 16 Feb 2015 18:08:12 -0500 Received: from mail.kapsi.fi ([217.30.184.167]:55253 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752702AbbBPXIG (ORCPT ); Mon, 16 Feb 2015 18:08:06 -0500 From: Mikko Rapeli To: linux-kernel@vger.kernel.org Cc: Mikko Rapeli , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-api@vger.kernel.org Subject: [PATCH 41/45] include/uapi/sound/emu10k1.h: hide gpr_valid, tram_valid and code_valid in userspace Date: Tue, 17 Feb 2015 00:05:44 +0100 Message-Id: <1424127948-22484-42-git-send-email-mikko.rapeli@iki.fi> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1424127948-22484-1-git-send-email-mikko.rapeli@iki.fi> References: <1424127948-22484-1-git-send-email-mikko.rapeli@iki.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a02:8070:d1af:b300:219:d2ff:fe03:c7a9 X-SA-Exim-Mail-From: mikko.rapeli@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1668 Lines: 47 The DECLARE_BITMAP macro is not available in userspace headers. Fixes userspace compile error: error: expected specifier-qualifier-list before ‘DECLARE_BITMAP’ Signed-off-by: Mikko Rapeli --- include/uapi/sound/emu10k1.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k1.h index ec1535b..f2fd870 100644 --- a/include/uapi/sound/emu10k1.h +++ b/include/uapi/sound/emu10k1.h @@ -300,7 +300,9 @@ struct snd_emu10k1_fx8010_control_old_gpr { struct snd_emu10k1_fx8010_code { char name[128]; +#ifdef __KERNEL__ DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ +#endif __u32 __user *gpr_map; /* initializers */ unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */ @@ -313,11 +315,15 @@ 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 */ +#ifdef __KERNEL__ DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */ +#endif __u32 __user *tram_data_map; /* data initializers */ __u32 __user *tram_addr_map; /* map initializers */ +#ifdef __KERNEL__ DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */ +#endif __u32 __user *code; /* one instruction - 64 bits */ }; -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/