kbuild: remove hardcoded _logo names from modpost
Subsystems (2)
PATCH 18/19 kbuild: remove hardcoded _logo names from modpost
Subject: [PATCH 18/19] kbuild: remove hardcoded _logo names from modpost
From: Sam Ravnborg <[email protected]>
Date: Sun, 3 Jun 2007 00:47:53 +0200
Replaced this with a __init_refok marker
in front of fb_find_logo().
I think that the __initdata marker for the logo's are wrong but I have not justified this so I did not remove it.
Signed-off-by Sam Ravnborg <[email protected]>
--- drivers/video/logo/logo.c | 7 +++++-- scripts/mod/modpost.c | 14 -------------- 2 files changed, 5 insertions(+), 16 deletions(-)
drivers/video/logo/logo.c +5 -2
@@ -34,8 +34,11 @@ extern const struct linux_logo logo_superh_vga16;extern const struct linux_logo logo_superh_clut224;extern const struct linux_logo logo_m32r_clut224; - -const struct linux_logo *fb_find_logo (int depth) +/* logo's are marked __initdata. Use __init_refok to tell +* modpost that it is intended that this function uses data +* marked __initdata. +*/ +const struct linux_logo * __init_refok fb_find_logo(int depth) {const struct linux_logo *logo =NULL ;
scripts/mod/modpost.c +0 -14
@@ -624,14 +624,6 @@ static int strrcmp(const char *s, const char *sub)* This pattern is identified by * refsymname = __init_begin, _sinittext, _einittext * -* Pattern 5: -* Logos used in drivers/video/logo reside in __initdata but the -* funtion that references them are EXPORT_SYMBOL() so cannot be -* marker __init. So we whitelist them here. -* The pattern is: -* tosec = .init.data -* fromsec = .text* -* refsymname = logo_ **/ static int secref_whitelist(const char *modname, const char *tosec, const char *fromsec, const char *atsym,
@@ -698,12 +690,6 @@ static int secref_whitelist(const char *modname, const char *tosec,if (strcmp (refsymname, *s) ==0 )return 1 ; -/* Check for pattern 5 */ -if ((strcmp (tosec,".init.data" ) ==0 ) && - (strncmp (fromsec,".text" ,strlen (".text" )) ==0 ) && - (strncmp (refsymname,"logo_" ,strlen ("logo_" )) ==0 )) -return 1 ; -return 0 ; }
Signature · 4 lines
1.5.1.rc3.1544.g8a923 ----- End forwarded message -----