From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753356AbdHJQeX (ORCPT ); Thu, 10 Aug 2017 12:34:23 -0400 Received: from terminus.zytor.com ([65.50.211.136]:45707 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753099AbdHJQeU (ORCPT ); Thu, 10 Aug 2017 12:34:20 -0400 Date: Thu, 10 Aug 2017 09:32:04 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: acme@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jolsa@kernel.org, hpa@zytor.com, namhyung@kernel.org, wangnan0@huawei.com, adrian.hunter@intel.com, mingo@kernel.org, dsahern@gmail.com Reply-To: jolsa@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, tglx@linutronix.de, adrian.hunter@intel.com, mingo@kernel.org, dsahern@gmail.com, namhyung@kernel.org, wangnan0@huawei.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools include uapi: Grab a copy of sound/asound.h Git-Commit-ID: a215684e10484149313068e0a9ea1978ee36d4f7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a215684e10484149313068e0a9ea1978ee36d4f7 Gitweb: http://git.kernel.org/tip/a215684e10484149313068e0a9ea1978ee36d4f7 Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 31 Jul 2017 16:45:32 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 1 Aug 2017 13:02:11 -0300 tools include uapi: Grab a copy of sound/asound.h We will use it to generate tables for beautifying ioctl's 'cmd' arg. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-wit4wwmrh9d37dtgtk0glbbj@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- {include => tools/include}/uapi/sound/asound.h | 6 +++--- tools/perf/MANIFEST | 1 + tools/perf/check-headers.sh | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/uapi/sound/asound.h b/tools/include/uapi/sound/asound.h similarity index 99% copy from include/uapi/sound/asound.h copy to tools/include/uapi/sound/asound.h index 1949923..87bf30b 100644 --- a/include/uapi/sound/asound.h +++ b/tools/include/uapi/sound/asound.h @@ -93,7 +93,7 @@ enum { SNDRV_HWDEP_IFACE_VX, /* Digigram VX cards */ SNDRV_HWDEP_IFACE_MIXART, /* Digigram miXart cards */ SNDRV_HWDEP_IFACE_USX2Y, /* Tascam US122, US224 & US428 usb */ - SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */ + SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */ SNDRV_HWDEP_IFACE_BLUETOOTH, /* Bluetooth audio */ SNDRV_HWDEP_IFACE_USX2Y_PCM, /* Tascam US122, US224 & US428 rawusb pcm */ SNDRV_HWDEP_IFACE_PCXHR, /* Digigram PCXHR */ @@ -383,7 +383,7 @@ struct snd_mask { struct snd_pcm_hw_params { unsigned int flags; - struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - + struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - SNDRV_PCM_HW_PARAM_FIRST_MASK + 1]; struct snd_mask mres[5]; /* reserved masks */ struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL - @@ -856,7 +856,7 @@ typedef int __bitwise snd_ctl_elem_iface_t; #define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually nothing, but may be updated */ #define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */ #define SNDRV_CTL_ELEM_ACCESS_OWNER (1<<10) /* write lock owner */ -#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* kernel use a TLV callback */ +#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* kernel use a TLV callback */ #define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */ /* bits 30 and 31 are obsoleted (for indirect access) */ diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index eb4ccd7..35a33ad 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -84,6 +84,7 @@ tools/include/uapi/linux/mman.h tools/include/uapi/linux/perf_event.h tools/include/uapi/linux/sched.h tools/include/uapi/linux/stat.h +tools/include/uapi/sound/asound.h tools/include/linux/poison.h tools/include/linux/rbtree.h tools/include/linux/rbtree_augmented.h diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh index 0024525..1e07c9b 100755 --- a/tools/perf/check-headers.sh +++ b/tools/perf/check-headers.sh @@ -7,6 +7,7 @@ include/uapi/linux/fcntl.h include/uapi/linux/perf_event.h include/uapi/linux/sched.h include/uapi/linux/stat.h +include/uapi/sound/asound.h include/linux/hash.h include/uapi/linux/hw_breakpoint.h arch/x86/include/asm/disabled-features.h