Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 577a32f6 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

mm: fix section mismatch warnings



modpost had two cases hardcoded for mm/
Shift over to __init_refok and kill the
hardcoded function names in modpost.

This has the drawback that the functions
will always be kept no matter configuration.
With previous code the function were placed in
init section if configuration allowed it.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 92080309
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -2165,7 +2165,7 @@ void __init setup_per_cpu_pageset(void)

#endif

static __meminit noinline
static noinline __init_refok
int zone_wait_table_init(struct zone *zone, unsigned long zone_size_pages)
{
	int i;
@@ -2678,7 +2678,7 @@ static void __meminit free_area_init_core(struct pglist_data *pgdat,
	}
}

static void __meminit alloc_node_mem_map(struct pglist_data *pgdat)
static void __init_refok alloc_node_mem_map(struct pglist_data *pgdat)
{
	/* Skip empty nodes */
	if (!pgdat->node_spanned_pages)
+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ EXPORT_SYMBOL(page_to_nid);
#endif

#ifdef CONFIG_SPARSEMEM_EXTREME
static struct mem_section noinline *sparse_index_alloc(int nid)
static struct mem_section noinline __init_refok *sparse_index_alloc(int nid)
{
	struct mem_section *section = NULL;
	unsigned long array_size = SECTIONS_PER_ROOT *
+0 −19
Original line number Diff line number Diff line
@@ -641,12 +641,6 @@ 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 and
 *  powerpc has a machine desc table for each platform.
@@ -678,12 +672,6 @@ 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 0 */
	if ((strcmp(fromsec, ".text.init.refok") == 0) ||
	    (strcmp(fromsec, ".data.init.refok") == 0))
@@ -741,13 +729,6 @@ 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) ||
	    (strcmp(fromsec, ".machine.desc") == 0))