Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit de30d36be171c05dfd66fa49e3d785e004f5ecdf

Authored by Krzysztof Helt
Committed by Jaroslav Kysela
1 parent d8009882e9
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ALSA: fix section mismatch in the sound_core 

The __exit cleanup_oss_soundcore() is called from
the __init init_soundcore(). This causes section mismatch
and breaks kernel's linking on sparc64.

Remove the __exit attribute from the cleanup_oss_soundcore().

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -13,7 +13,7 @@
13 13  
14 14 #ifdef CONFIG_SOUND_OSS_CORE
15 15 static int __init init_oss_soundcore(void);
16   -static void __exit cleanup_oss_soundcore(void);
  16 +static void cleanup_oss_soundcore(void);
17 17 #else
18 18 static inline int init_oss_soundcore(void) { return 0; }
19 19 static inline void cleanup_oss_soundcore(void) { }
... ... @@ -574,7 +574,7 @@
574 574  
575 575 MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
576 576  
577   -static void __exit cleanup_oss_soundcore(void)
  577 +static void cleanup_oss_soundcore(void)
578 578 {
579 579 /* We have nothing to really do here - we know the lists must be
580 580 empty */