diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-10 08:06:47 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-10 08:06:47 +0100 |
commit | 91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb (patch) | |
tree | dbea28420ff33aca40be8d3cd901305064b4ea24 /include/sound/seq_kernel.h | |
parent | d04fdafc066fed10cc9610b2f36f1d0ff0327864 (diff) | |
parent | 1c9dbd4615fd751e5e0b99807a3c7c8612e28e20 (diff) | |
download | linux-91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb.tar.bz2 |
Merge branch 'linus' into x86/asm, to resolve conflict
Conflicts:
arch/x86/mm/mem_encrypt.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/sound/seq_kernel.h')
-rw-r--r-- | include/sound/seq_kernel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/seq_kernel.h b/include/sound/seq_kernel.h index feb58d455560..4b9ee3009aa0 100644 --- a/include/sound/seq_kernel.h +++ b/include/sound/seq_kernel.h @@ -49,7 +49,8 @@ typedef union snd_seq_timestamp snd_seq_timestamp_t; #define SNDRV_SEQ_DEFAULT_CLIENT_EVENTS 200 /* max delivery path length */ -#define SNDRV_SEQ_MAX_HOPS 10 +/* NOTE: this shouldn't be greater than MAX_LOCKDEP_SUBCLASSES */ +#define SNDRV_SEQ_MAX_HOPS 8 /* max size of event size */ #define SNDRV_SEQ_MAX_EVENT_LEN 0x3fffffff |