diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-09 08:39:15 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-09 08:40:43 +0100 |
| commit | 8e4877768f0d6225be65a84a43f27ca6ea3eda0b (patch) | |
| tree | fcea6f5afa01e062d0adb4a30e926e9e2866da25 | |
| parent | 0a73e3dd64e0a02458f2d8f964acc95f9a1bda06 (diff) | |
| download | alsa-driver-build-unstable-8e4877768f0d6225be65a84a43f27ca6ea3eda0b.tar.gz | |
Move ASYNC_DOMAIN_EXCLUSIVE() hack into adriver.h
Don't include linux/async.h but check only with the version number
since it leads to a mysterious segfault at genksyms.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | alsa/include/adriver.h | 8 | ||||
| -rw-r--r-- | alsa/pci/hda/hda_codec.c | 4 | ||||
| -rw-r--r-- | alsa/soc/soc-dapm.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/alsa/include/adriver.h b/alsa/include/adriver.h index ae02ed297..a7c72c3b0 100644 --- a/alsa/include/adriver.h +++ b/alsa/include/adriver.h @@ -1779,4 +1779,12 @@ static inline struct fd fdget(unsigned int fd) #define reinit_completion(x) ((x)->done = 0) #endif +/* including linux/async.h at at this point leads to a segfault in genksyms + * by some reason, so check with version number + */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) +#include <linux/list.h> +#define ASYNC_DOMAIN_EXCLUSIVE(name) LIST_HEAD(name) +#endif + #endif /* __SOUND_LOCAL_DRIVER_H */ diff --git a/alsa/pci/hda/hda_codec.c b/alsa/pci/hda/hda_codec.c index 4e0a177d1..39010da80 100644 --- a/alsa/pci/hda/hda_codec.c +++ b/alsa/pci/hda/hda_codec.c @@ -1,6 +1,2 @@ #include "adriver.h" -#include <linux/async.h> -#ifndef ASYNC_DOMAIN_EXCLUSIVE -#define ASYNC_DOMAIN_EXCLUSIVE(name) LIST_HEAD(name) -#endif #include "../../alsa-kernel/pci/hda/hda_codec.c" diff --git a/alsa/soc/soc-dapm.c b/alsa/soc/soc-dapm.c index c2f48549d..1fb34d733 100644 --- a/alsa/soc/soc-dapm.c +++ b/alsa/soc/soc-dapm.c @@ -3,8 +3,4 @@ /* HACK HACK - debugfs_remove_recursive() isn't defined */ #undef CONFIG_DEBUG_FS #endif -#include <linux/async.h> -#ifndef ASYNC_DOMAIN_EXCLUSIVE -#define ASYNC_DOMAIN_EXCLUSIVE(name) LIST_HEAD(name) -#endif #include "../alsa-kernel/soc/soc-dapm.c" |