[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20170123121509.3143377-1-arnd@arndb.de>
Date: Mon, 23 Jan 2017 13:14:39 +0100
From: Arnd Bergmann <arnd@...db.de>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Dan Williams <dan.j.williams@...el.com>,
Arnd Bergmann <arnd@...db.de>, linux-mm@...ck.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] mm: track-active-portions-of-a-section-at-boot-fix fix
A bugfix introduced a new warning as it marked a function as __init
that is called by both __init and non-__init functions:
WARNING: vmlinux.o(.text.unlikely+0x1b26): Section mismatch in reference from the function section_deactivate() to the function .init.text:section_active_mask()
WARNING: vmlinux.o(.meminit.text+0x1ce0): Section mismatch in reference from the function sparse_add_section() to the function .init.text:section_active_mask()
This removes the annotation again.
Fixes: mmotm ("mm-track-active-portions-of-a-section-at-boot-fix")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
mm/sparse.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/sparse.c b/mm/sparse.c
index 3e4458c8e0e9..4267d09b656b 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -189,8 +189,8 @@ static int __init section_active_index(phys_addr_t phys)
return (phys & ~(PA_SECTION_MASK)) / SECTION_ACTIVE_SIZE;
}
-static unsigned long __init section_active_mask(unsigned long pfn,
- unsigned long nr_pages)
+static unsigned long section_active_mask(unsigned long pfn,
+ unsigned long nr_pages)
{
int idx_start, idx_size;
phys_addr_t start, size;
--
2.9.0
Powered by blists - more mailing lists