linux-kernel - [PATCH linux-next] snd-hda: fix build errors

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <492713E8.9080103@oracle.com>
Date:	Fri, 21 Nov 2008 12:02:48 -0800
From:	Randy Dunlap <randy.dunlap@...cle.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
	tiwai@...e.de, Wu Fengguang <wfg@...ux.intel.com>
Subject: [PATCH linux-next] snd-hda: fix build errors

From: Randy Dunlap <randy.dunlap@...cle.com>

First error comes from snd_hda_eld_proc_new() not being static
when CONFIG_PROC_FS=n.  After that is fixed, the next problem is:
ERROR: "snd_print_pcm_rates" [sound/pci/hda/snd-hda-intel.ko] undefined!

so I made a static inline version of that one too, for CONFIG_PROC_FS=n.
Please build/test more config variations.

  LD [M]  sound/pci/hda/snd-hda-intel.o
sound/pci/hda/hda_eld.o: In function `snd_hda_eld_proc_new':
(.text+0x0): multiple definition of `snd_hda_eld_proc_new'
sound/pci/hda/hda_codec.o:(.text+0x58): first defined here
sound/pci/hda/hda_hwdep.o: In function `snd_hda_eld_proc_new':
(.text+0x0): multiple definition of `snd_hda_eld_proc_new'
sound/pci/hda/hda_codec.o:(.text+0x58): first defined here
sound/pci/hda/hda_generic.o: In function `snd_hda_eld_proc_new':
(.text+0x1d): multiple definition of `snd_hda_eld_proc_new'
sound/pci/hda/hda_codec.o:(.text+0x58): first defined here
sound/pci/hda/patch_realtek.o: In function `snd_hda_eld_proc_new':
(.text+0x3b): multiple definition of `snd_hda_eld_proc_new'
sound/pci/hda/hda_codec.o:(.text+0x58): first defined here
sound/pci/hda/patch_cmedia.o: In function `snd_hda_eld_proc_new':
(.text+0x0): multiple definition of `snd_hda_eld_proc_new'
sound/pci/hda/hda_codec.o:(.text+0x58): first defined here
sound/pci/hda/patch_analog.o: In function `snd_hda_eld_proc_new':
(.text+0x0): multiple definition of `snd_hda_eld_proc_new'
sound/pci/hda/hda_codec.o:(.text+0x58): first defined here
sound/pci/hda/patch_sigmatel.o: In function `snd_hda_eld_proc_new':
(.text+0x3b): multiple definition of `snd_hda_eld_proc_new'
sound/pci/hda/hda_codec.o:(.text+0x58): first defined here
sound/pci/hda/patch_atihdmi.o: In function `snd_hda_eld_proc_new':
(.text+0x3b): multiple definition of `snd_hda_eld_proc_new'
sound/pci/hda/hda_codec.o:(.text+0x58): first defined here
sound/pci/hda/patch_conexant.o: In function `snd_hda_eld_proc_new':
(.text+0x0): multiple definition of `snd_hda_eld_proc_new'
sound/pci/hda/hda_codec.o:(.text+0x58): first defined here
sound/pci/hda/patch_via.o: In function `snd_hda_eld_proc_new':
(.text+0x0): multiple definition of `snd_hda_eld_proc_new'
sound/pci/hda/hda_codec.o:(.text+0x58): first defined here
sound/pci/hda/patch_intelhdmi.o: In function `snd_hda_eld_proc_new':
(.text+0x3b): multiple definition of `snd_hda_eld_proc_new'
sound/pci/hda/hda_codec.o:(.text+0x58): first defined here
make[4]: *** [sound/pci/hda/snd-hda-intel.o] Error 1

Signed-off-by: Randy Dunlap <randy.dunlap@...cle.com>
cc: Wu Fengguang <wfg@...ux.intel.com>
cc: Takashi Iwai <tiwai@...e.de>
---
 sound/pci/hda/hda_local.h |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- linux-next-20081121.orig/sound/pci/hda/hda_local.h
+++ linux-next-20081121/sound/pci/hda/hda_local.h
@@ -285,7 +285,12 @@ static inline int snd_hda_codec_proc_new
 #endif
 
 #define SND_PRINT_RATES_ADVISED_BUFSIZE	80
+#ifdef CONFIG_PROC_FS
 void snd_print_pcm_rates(int pcm, char *buf, int buflen);
+#else
+static inline void snd_print_pcm_rates(int pcm, char *buf, int buflen)
+{ }
+#endif
 
 #define SND_PRINT_BITS_ADVISED_BUFSIZE	16
 void snd_print_pcm_bits(int pcm, char *buf, int buflen);
@@ -490,7 +495,7 @@ void snd_hdmi_show_eld(struct hdmi_eld *
 #ifdef CONFIG_PROC_FS
 int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld);
 #else
-inline int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld)
+static inline int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld)
 {
 	return 0;
 }

View attachment "config-r6373" of type "text/plain" (60266 bytes)