Commit 83cda2bb authored by Sam Ravnborg's avatar Sam Ravnborg

kbuild: be more foregiving on init section naming

In the whitelist function of modpost now use the same
check to identify init_section as in other places of modpost.
This has the effect that we now recognize sections named
.init.text.19 as init sections and we no longer warn
when we see these.

At the same time make surrounding code readable by dropping
use of temporary flags.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 2f5ee619
...@@ -658,8 +658,8 @@ static int data_section(const char *name) ...@@ -658,8 +658,8 @@ static int data_section(const char *name)
* These functions may often be marked __init and we do not want to * These functions may often be marked __init and we do not want to
* warn here. * warn here.
* the pattern is identified by: * the pattern is identified by:
* tosec = .init.text | .exit.text | .init.data * tosec = init or exit section
* fromsec = .data | .data.rel | .data.rel.* * fromsec = data section
* atsym = *driver, *_template, *_sht, *_ops, *_probe, *probe_one, *_console, *_timer * atsym = *driver, *_template, *_sht, *_ops, *_probe, *probe_one, *_console, *_timer
* *
* Pattern 3: * Pattern 3:
...@@ -680,7 +680,6 @@ static int secref_whitelist(const char *modname, const char *tosec, ...@@ -680,7 +680,6 @@ static int secref_whitelist(const char *modname, const char *tosec,
const char *fromsec, const char *atsym, const char *fromsec, const char *atsym,
const char *refsymname) const char *refsymname)
{ {
int f1 = 1, f2 = 1;
const char **s; const char **s;
const char *pat2sym[] = { const char *pat2sym[] = {
"driver", "driver",
...@@ -707,31 +706,16 @@ static int secref_whitelist(const char *modname, const char *tosec, ...@@ -707,31 +706,16 @@ static int secref_whitelist(const char *modname, const char *tosec,
return 1; return 1;
/* Check for pattern 1 */ /* Check for pattern 1 */
if (strcmp(tosec, ".init.data") != 0) if ((strcmp(tosec, ".init.data") == 0) &&
f1 = 0; (strncmp(fromsec, ".data", strlen(".data")) == 0) &&
if (strncmp(fromsec, ".data", strlen(".data")) != 0) (strncmp(atsym, "__param", strlen("__param")) == 0))
f1 = 0; return 1;
if (strncmp(atsym, "__param", strlen("__param")) != 0)
f1 = 0;
if (f1)
return f1;
/* Check for pattern 2 */ /* Check for pattern 2 */
if ((strcmp(tosec, ".init.text") != 0) && if ((init_section(tosec) || exit_section(tosec)) && data_section(fromsec))
(strcmp(tosec, ".exit.text") != 0) && for (s = pat2sym; *s; s++)
(strcmp(tosec, ".init.data") != 0)) if (strrcmp(atsym, *s) == 0)
f2 = 0; return 1;
if ((strcmp(fromsec, ".data") != 0) &&
(strcmp(fromsec, ".data.rel") != 0) &&
(strncmp(fromsec, ".data.rel.", strlen(".data.rel.")) != 0))
f2 = 0;
for (s = pat2sym; *s; s++)
if (strrcmp(atsym, *s) == 0)
f1 = 1;
if (f1 && f2)
return 1;
/* Check for pattern 3 */ /* Check for pattern 3 */
if ((strcmp(fromsec, ".text.head") == 0) && if ((strcmp(fromsec, ".text.head") == 0) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment