Skip to content

Commit 666fd69

Browse files
committed
tools headers: Update the linux/unaligned.h copy with the kernel sources
JIRA: https://issues.redhat.com/browse/RHEL-80682 Omitted-fix: ddc5929 ("tools headers: Update the KVM headers with the kernel sources") Omitted-fix: 9dbe666 ("tools headers: Update the socket headers with the kernel sources") Omitted-fix: ae62977 ("tools headers: Update the uapi/linux/perf_event.h copy with the kernel sources") Omitted-fix: af74e5f ("tools headers: Update the VFS headers with the kernel sources") Omitted-fix: 22f7208 ("tools headers: Update the syscall table with the kernel sources") Omitted-fix: df4bd8c ("tools headers: Update the uapi/linux/prctl.h copy with the kernel sources") Omitted-fix: 4056cf4 ("tools headers: Update the uapi/asm-generic/mman-common.h copy with the kernel sources") Omitted-fix: 847f140 ("tools headers: Update the x86 headers with the kernel sources") Omitted-fix: 7f56978 ("tools headers: Update the arch/x86/lib/memset_64.S copy with the kernel sources") all above not relevant to sound/ commit 7470998 Author: Namhyung Kim <namhyung@kernel.org> Date: Wed Apr 9 17:11:23 2025 -0700 tools headers: Update the linux/unaligned.h copy with the kernel sources To pick up the changes in: 3846699 ALSA: rawmidi: Make tied_device=0 as default / unknown 7bb49d2 ALSA: rawmidi: Bump protocol version to 2.0.5 b8fefed ALSA: rawmidi: Show substream activity in info ioctl bdf4644 ALSA: rawmidi: Expose the tied device number in info ioctl Addressing this perf tools build warning: Warning: Kernel ABI header differences: diff -u tools/perf/trace/beauty/include/uapi/sound/asound.h include/uapi/sound/asound.h Please see tools/include/uapi/README for further details. Acked-by: Ingo Molnar <mingo@kernel.org> Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> Cc: linux-sound@vger.kernel.org Link: https://lore.kernel.org/r/20250410001125.391820-9-namhyung@kernel.org Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
1 parent 62ab0b3 commit 666fd69

File tree

1 file changed

+6
-2
lines changed
  • tools/perf/trace/beauty/include/uapi/sound

1 file changed

+6
-2
lines changed

tools/perf/trace/beauty/include/uapi/sound/asound.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ enum {
716716
* Raw MIDI section - /dev/snd/midi??
717717
*/
718718

719-
#define SNDRV_RAWMIDI_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 4)
719+
#define SNDRV_RAWMIDI_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 5)
720720

721721
enum {
722722
SNDRV_RAWMIDI_STREAM_OUTPUT = 0,
@@ -728,6 +728,9 @@ enum {
728728
#define SNDRV_RAWMIDI_INFO_INPUT 0x00000002
729729
#define SNDRV_RAWMIDI_INFO_DUPLEX 0x00000004
730730
#define SNDRV_RAWMIDI_INFO_UMP 0x00000008
731+
#define SNDRV_RAWMIDI_INFO_STREAM_INACTIVE 0x00000010
732+
733+
#define SNDRV_RAWMIDI_DEVICE_UNKNOWN 0
731734

732735
struct snd_rawmidi_info {
733736
unsigned int device; /* RO/WR (control): device number */
@@ -740,7 +743,8 @@ struct snd_rawmidi_info {
740743
unsigned char subname[32]; /* name of active or selected subdevice */
741744
unsigned int subdevices_count;
742745
unsigned int subdevices_avail;
743-
unsigned char reserved[64]; /* reserved for future use */
746+
int tied_device; /* R: tied rawmidi device (UMP/legacy) */
747+
unsigned char reserved[60]; /* reserved for future use */
744748
};
745749

746750
#define SNDRV_RAWMIDI_MODE_FRAMING_MASK (7<<0)

0 commit comments

Comments
 (0)