diff mbox

[26/74] lto, sound: Fix export symbols for !CONFIG_MODULES

Message ID 1345345030-22211-27-git-send-email-andi@firstfloor.org (mailing list archive)
State New, archived
Headers show

Commit Message

Andi Kleen Aug. 19, 2012, 2:56 a.m. UTC
From: Andi Kleen <ak@linux.intel.com>

The new LTO EXPORT_SYMBOL references symbols even without CONFIG_MODULES.
Since these functions are macros in this case this doesn't work.
Add a ifdef to fix the build.

Cc: tiwai@suse.de
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 sound/core/seq/seq_device.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Comments

Takashi Iwai Aug. 20, 2012, 8:30 a.m. UTC | #1
At Sat, 18 Aug 2012 19:56:22 -0700,
Andi Kleen wrote:
> 
> From: Andi Kleen <ak@linux.intel.com>
> 
> The new LTO EXPORT_SYMBOL references symbols even without CONFIG_MODULES.
> Since these functions are macros in this case this doesn't work.
> Add a ifdef to fix the build.
> 
> Cc: tiwai@suse.de
> Signed-off-by: Andi Kleen <ak@linux.intel.com>

Reviewed-by: Takashi Iwai <tiwai@suse.de>

I haven't seen the background, so let me ask a dumb question:
is it a 3.6 fix or for 3.7?

And shall I apply this one to sound git tree, or would you like to
apply all in a single tree?


thanks,

Takashi

> ---
>  sound/core/seq/seq_device.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
> index 5cf8d65..60e8fc1 100644
> --- a/sound/core/seq/seq_device.c
> +++ b/sound/core/seq/seq_device.c
> @@ -569,5 +569,7 @@ EXPORT_SYMBOL(snd_seq_device_load_drivers);
>  EXPORT_SYMBOL(snd_seq_device_new);
>  EXPORT_SYMBOL(snd_seq_device_register_driver);
>  EXPORT_SYMBOL(snd_seq_device_unregister_driver);
> +#ifdef CONFIG_MODULES
>  EXPORT_SYMBOL(snd_seq_autoload_lock);
>  EXPORT_SYMBOL(snd_seq_autoload_unlock);
> +#endif
> -- 
> 1.7.7.6
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Andi Kleen Aug. 20, 2012, 9:45 a.m. UTC | #2
On Mon, Aug 20, 2012 at 10:30:29AM +0200, Takashi Iwai wrote:
> At Sat, 18 Aug 2012 19:56:22 -0700,
> Andi Kleen wrote:
> > 
> > From: Andi Kleen <ak@linux.intel.com>
> > 
> > The new LTO EXPORT_SYMBOL references symbols even without CONFIG_MODULES.
> > Since these functions are macros in this case this doesn't work.
> > Add a ifdef to fix the build.
> > 
> > Cc: tiwai@suse.de
> > Signed-off-by: Andi Kleen <ak@linux.intel.com>
> 
> Reviewed-by: Takashi Iwai <tiwai@suse.de>
> 
> I haven't seen the background, so let me ask a dumb question:
> is it a 3.6 fix or for 3.7?

I don't strictly need it for 3.6, 3.7 is ok.

> 
> And shall I apply this one to sound git tree, or would you like to
> apply all in a single tree?

Please apply it in yours.

-Andi
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Takashi Iwai Aug. 20, 2012, 9:53 a.m. UTC | #3
At Mon, 20 Aug 2012 11:45:45 +0200,
Andi Kleen wrote:
> 
> On Mon, Aug 20, 2012 at 10:30:29AM +0200, Takashi Iwai wrote:
> > At Sat, 18 Aug 2012 19:56:22 -0700,
> > Andi Kleen wrote:
> > > 
> > > From: Andi Kleen <ak@linux.intel.com>
> > > 
> > > The new LTO EXPORT_SYMBOL references symbols even without CONFIG_MODULES.
> > > Since these functions are macros in this case this doesn't work.
> > > Add a ifdef to fix the build.
> > > 
> > > Cc: tiwai@suse.de
> > > Signed-off-by: Andi Kleen <ak@linux.intel.com>
> > 
> > Reviewed-by: Takashi Iwai <tiwai@suse.de>
> > 
> > I haven't seen the background, so let me ask a dumb question:
> > is it a 3.6 fix or for 3.7?
> 
> I don't strictly need it for 3.6, 3.7 is ok.
> 
> > 
> > And shall I apply this one to sound git tree, or would you like to
> > apply all in a single tree?
> 
> Please apply it in yours.

OK, applied now.  Thanks.


Takashi
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
index 5cf8d65..60e8fc1 100644
--- a/sound/core/seq/seq_device.c
+++ b/sound/core/seq/seq_device.c
@@ -569,5 +569,7 @@  EXPORT_SYMBOL(snd_seq_device_load_drivers);
 EXPORT_SYMBOL(snd_seq_device_new);
 EXPORT_SYMBOL(snd_seq_device_register_driver);
 EXPORT_SYMBOL(snd_seq_device_unregister_driver);
+#ifdef CONFIG_MODULES
 EXPORT_SYMBOL(snd_seq_autoload_lock);
 EXPORT_SYMBOL(snd_seq_autoload_unlock);
+#endif