summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2007-05-17 20:43:54 +0200
committerSam Ravnborg <sam@ravnborg.org>2007-05-19 09:11:58 +0200
commit92080309df1975729a9f8b45fd56528817e34db8 (patch)
treef82ec2fb2b1d5fa68af807b6acb1b033c7a34e17
parent0e0d314e6a01bb14d303e35e6f7ba24b17020044 (diff)
downloadlinux-3.10-92080309df1975729a9f8b45fd56528817e34db8.tar.gz
linux-3.10-92080309df1975729a9f8b45fd56528817e34db8.tar.bz2
linux-3.10-92080309df1975729a9f8b45fd56528817e34db8.zip
init/main: use __init_refok to fix section mismatch
Kill a special case in modpost by introducing the __init_refok marker. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--init/main.c2
-rw-r--r--scripts/mod/modpost.c14
2 files changed, 1 insertions, 15 deletions
diff --git a/init/main.c b/init/main.c
index 1940fa75e82..eb8bdbae4fc 100644
--- a/init/main.c
+++ b/init/main.c
@@ -423,7 +423,7 @@ static void __init setup_command_line(char *command_line)
* gcc-3.4 accidentally inlines this function, so use noinline.
*/
-static void noinline rest_init(void)
+static void noinline __init_refok rest_init(void)
__releases(kernel_lock)
{
int pid;
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 7c87267b6ff..40fb7b6a00b 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -626,14 +626,6 @@ static int strrcmp(const char *s, const char *sub)
* This pattern is identified by
* refsymname = __init_begin, _sinittext, _einittext
*
- * Pattern 6:
- * During the early init phase we have references from .init.text to
- * .text we have an intended section mismatch - do not warn about it.
- * See kernel_init() in init/main.c
- * tosec = .init.text
- * fromsec = .text
- * atsym = kernel_init
- *
* Pattern 7:
* Logos used in drivers/video/logo reside in __initdata but the
* funtion that references them are EXPORT_SYMBOL() so cannot be
@@ -738,12 +730,6 @@ static int secref_whitelist(const char *modname, const char *tosec,
if (strcmp(refsymname, *s) == 0)
return 1;
- /* Check for pattern 6 */
- if ((strcmp(tosec, ".init.text") == 0) &&
- (strcmp(fromsec, ".text") == 0) &&
- (strcmp(refsymname, "kernel_init") == 0))
- return 1;
-
/* Check for pattern 7 */
if ((strcmp(tosec, ".init.data") == 0) &&
(strncmp(fromsec, ".text", strlen(".text")) == 0) &&