3 files changed, 29 insertions, 2 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index fd7745111e16..6fd0b7455b0b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2179,7 +2179,7 @@ void __init setup_per_cpu_pageset(void)
 
 #endif
 
-static __meminit
+static __meminit noinline
 int zone_wait_table_init(struct zone *zone, unsigned long zone_size_pages)
 {
         int i;
diff --git a/mm/sparse.c b/mm/sparse.c
index 9079afe8f457..6f3fff907bc2 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -44,7 +44,7 @@ EXPORT_SYMBOL(page_to_nid);
 #endif
 
 #ifdef CONFIG_SPARSEMEM_EXTREME
-static struct mem_section *sparse_index_alloc(int nid)
+static struct mem_section noinline *sparse_index_alloc(int nid)
 {
         struct mem_section *section = NULL;
         unsigned long array_size = SECTIONS_PER_ROOT *
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 4ab36de45aa2..480e18b00aa6 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -642,6 +642,16 @@ static int strrcmp(const char *s, const char *sub)
  *  tosec   = .init.text
  *  fromsec  = .paravirtprobe
  *
+ * Pattern 9:
+ *  Some of functions are common code between boot time and hotplug
+ *  time. The bootmem allocater is called only boot time in its
+ *  functions. So it's ok to reference.
+ *  tosec    = .init.text
+ *
+ * Pattern 10:
+ *  ia64 has machvec table for each platform. It is mixture of function
+ *  pointer of .init.text and .text.
+ *  fromsec  = .machvec
  **/
 static int secref_whitelist(const char *modname, const char *tosec,
                             const char *fromsec, const char *atsym,
@@ -668,6 +678,12 @@ static int secref_whitelist(const char *modname, const char *tosec,
                 NULL
         };
 
+        const char *pat4sym[] = {
+                "sparse_index_alloc",
+                "zone_wait_table_init",
+                NULL
+        };
+
         /* Check for pattern 1 */
         if (strcmp(tosec, ".init.data") != 0)
                 f1 = 0;
@@ -726,6 +742,17 @@ static int secref_whitelist(const char *modname, const char *tosec,
             (strcmp(fromsec, ".paravirtprobe") == 0))
                 return 1;
 
+        /* Check for pattern 9 */
+        if ((strcmp(tosec, ".init.text") == 0) &&
+            (strcmp(fromsec, ".text") == 0))
+                for (s = pat4sym; *s; s++)
+                        if (strcmp(atsym, *s) == 0)
+                                return 1;
+
+        /* Check for pattern 10 */
+        if (strcmp(fromsec, ".machvec") == 0)
+                return 1;
+
         return 0;
 }