diff options
| author | Laura Abbott <lauraa@codeaurora.org> | 2013-06-28 12:52:17 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:03:23 -0700 |
| commit | a7470fb452691c07f79cbd431e72f0315ab25e1d (patch) | |
| tree | 6c01b443a46d6a2e828d9836036eac0bb5091dde | |
| parent | 753315050c99999e6cd6d9df0e78070007582738 (diff) | |
mm: Remove __init annotations from free_bootmem_late
free_bootmem_late is currently set up to only be used in init
functions. Some clients need to use this function past initcalls.
The functions themselves have no restrictions on being used later
minus the __init annotations so remove the annotation.
Change-Id: I7c7e15cf2780a8843ebb4610da5b633c9abb0b3d
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
[abhimany@codeaurora.org: resolve minor conflict
and remove __init from nobootmem.c]
Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>
| -rw-r--r-- | mm/bootmem.c | 2 | ||||
| -rw-r--r-- | mm/nobootmem.c | 2 | ||||
| -rw-r--r-- | mm/page_alloc.c | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c index 3b6380784c28..90336470273c 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -154,7 +154,7 @@ unsigned long __init init_bootmem(unsigned long start, unsigned long pages) * down, but we are still initializing the system. Pages are given directly * to the page allocator, no bootmem metadata is updated because it is gone. */ -void __init free_bootmem_late(unsigned long physaddr, unsigned long size) +void free_bootmem_late(unsigned long physaddr, unsigned long size) { unsigned long cursor, end; diff --git a/mm/nobootmem.c b/mm/nobootmem.c index e57cf24babd6..a81d521db56a 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -76,7 +76,7 @@ again: * down, but we are still initializing the system. Pages are given directly * to the page allocator, no bootmem metadata is updated because it is gone. */ -void __init free_bootmem_late(unsigned long addr, unsigned long size) +void free_bootmem_late(unsigned long addr, unsigned long size) { unsigned long cursor, end; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 89ef8347900c..0b9e7c1513bf 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1015,8 +1015,7 @@ static void __free_pages_ok(struct page *page, unsigned int order) local_irq_restore(flags); } -static void __init __free_pages_boot_core(struct page *page, - unsigned long pfn, unsigned int order) +static void __init __free_pages_boot_core(struct page *page, unsigned long pfn, unsigned int order) { unsigned int nr_pages = 1 << order; struct page *p = page; @@ -1088,7 +1087,7 @@ static inline bool __meminit meminit_pfn_in_nid(unsigned long pfn, int node, #endif -void __init __free_pages_bootmem(struct page *page, unsigned long pfn, +void __free_pages_bootmem(struct page *page, unsigned long pfn, unsigned int order) { if (early_page_uninitialised(pfn)) |