diff options
-rw-r--r-- | init/main.c | 2 | ||||
-rw-r--r-- | scripts/mod/modpost.c | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/init/main.c b/init/main.c index 1940fa75e82e..eb8bdbae4fc7 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -423,7 +423,7 @@ static void __init setup_command_line(char *command_line) | |||
423 | * gcc-3.4 accidentally inlines this function, so use noinline. | 423 | * gcc-3.4 accidentally inlines this function, so use noinline. |
424 | */ | 424 | */ |
425 | 425 | ||
426 | static void noinline rest_init(void) | 426 | static void noinline __init_refok rest_init(void) |
427 | __releases(kernel_lock) | 427 | __releases(kernel_lock) |
428 | { | 428 | { |
429 | int pid; | 429 | int pid; |
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 7c87267b6ff0..40fb7b6a00b1 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
@@ -626,14 +626,6 @@ static int strrcmp(const char *s, const char *sub) | |||
626 | * This pattern is identified by | 626 | * This pattern is identified by |
627 | * refsymname = __init_begin, _sinittext, _einittext | 627 | * refsymname = __init_begin, _sinittext, _einittext |
628 | * | 628 | * |
629 | * Pattern 6: | ||
630 | * During the early init phase we have references from .init.text to | ||
631 | * .text we have an intended section mismatch - do not warn about it. | ||
632 | * See kernel_init() in init/main.c | ||
633 | * tosec = .init.text | ||
634 | * fromsec = .text | ||
635 | * atsym = kernel_init | ||
636 | * | ||
637 | * Pattern 7: | 629 | * Pattern 7: |
638 | * Logos used in drivers/video/logo reside in __initdata but the | 630 | * Logos used in drivers/video/logo reside in __initdata but the |
639 | * funtion that references them are EXPORT_SYMBOL() so cannot be | 631 | * funtion that references them are EXPORT_SYMBOL() so cannot be |
@@ -738,12 +730,6 @@ static int secref_whitelist(const char *modname, const char *tosec, | |||
738 | if (strcmp(refsymname, *s) == 0) | 730 | if (strcmp(refsymname, *s) == 0) |
739 | return 1; | 731 | return 1; |
740 | 732 | ||
741 | /* Check for pattern 6 */ | ||
742 | if ((strcmp(tosec, ".init.text") == 0) && | ||
743 | (strcmp(fromsec, ".text") == 0) && | ||
744 | (strcmp(refsymname, "kernel_init") == 0)) | ||
745 | return 1; | ||
746 | |||
747 | /* Check for pattern 7 */ | 733 | /* Check for pattern 7 */ |
748 | if ((strcmp(tosec, ".init.data") == 0) && | 734 | if ((strcmp(tosec, ".init.data") == 0) && |
749 | (strncmp(fromsec, ".text", strlen(".text")) == 0) && | 735 | (strncmp(fromsec, ".text", strlen(".text")) == 0) && |