ALSA: uapi: Add linux/types.h include back (but carefully)

A few uapi/sound/*.h headers have been corrected for recovering from
the compile errors with the existing user-space code (alsa-lib) by the
recent commits.  OTOH, these introduced another regression, as now
linux/types.h inclusion became mandatory for the uapi header checks.

As a compromise, this patch re-adds linux/types.h inclusions again,
but conditionally not to break other non-standard user-space stuff
again.

Fixes: 2e4688676392 ("ALSA: emu10k1: Make uapi/emu10k1.h compilable again")
Fixes: d63e63d42107 ("ALSA: hdsp: Make uapi/hdsp.h compilable again")
Fixes: 4fa406caf950 ("ALSA: hdspm: Drop linux/types.h inclusion in uapi header")
Reported-by: kbuild test robot <lkp@intel.com>
Link: https://lore.kernel.org/r/20191230212742.28925-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k1.h
index 6bcd76f64c1cb89dc80588a1b1d4daa5352a12fc..88609cc0524c9f20acdb24c916a9b3c29779713b 100644 (file)
--- a/include/uapi/sound/emu10k1.h
+++ b/include/uapi/sound/emu10k1.h
@@ -23,6 +23,10 @@
 #ifndef _UAPI__SOUND_EMU10K1_H
 #define _UAPI__SOUND_EMU10K1_H
 
+#ifdef __linux__
+#include <linux/types.h>
+#endif
+
 /*
  * ---- FX8010 ----
  */

diff --git a/include/uapi/sound/hdsp.h b/include/uapi/sound/hdsp.h
index 7ac2d3f2a9b32a86db37f7a620146b447a07eee8..b8df62b60f4d021f827b338ba4bcbac219bf1a9a 100644 (file)
--- a/include/uapi/sound/hdsp.h
+++ b/include/uapi/sound/hdsp.h
@@ -20,6 +20,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#ifdef __linux__
+#include <linux/types.h>
+#endif
+
 #define HDSP_MATRIX_MIXER_SIZE 2048
 
 enum HDSP_IO_Type {

diff --git a/include/uapi/sound/hdspm.h b/include/uapi/sound/hdspm.h
index 3fbfd9dc5f5137bb68025a769ad1d58b12690435..14af3d00ea3f78c4f03f9682045ba2f3d367c4e8 100644 (file)
--- a/include/uapi/sound/hdspm.h
+++ b/include/uapi/sound/hdspm.h
@@ -21,6 +21,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#ifdef __linux__
+#include <linux/types.h>
+#endif
+
 /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */
 #define HDSPM_MAX_CHANNELS      64