Commit dae28066 authored by Chen, Kenneth W's avatar Chen, Kenneth W Committed by Tony Luck

[IA64] add init declaration to memory initialization functions

Add init declaration to variables/functions used for memory
initialization.  I don't think they would clash with memory
hotplug.  If they do, please yell.
Signed-off-by: default avatarKen Chen <kenneth.w.chen@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 244fd545
...@@ -131,8 +131,8 @@ EXPORT_SYMBOL(ia64_max_iommu_merge_mask); ...@@ -131,8 +131,8 @@ EXPORT_SYMBOL(ia64_max_iommu_merge_mask);
/* /*
* We use a special marker for the end of memory and it uses the extra (+1) slot * We use a special marker for the end of memory and it uses the extra (+1) slot
*/ */
struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1]; struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1] __initdata;
int num_rsvd_regions; int num_rsvd_regions __initdata;
/* /*
...@@ -141,7 +141,7 @@ int num_rsvd_regions; ...@@ -141,7 +141,7 @@ int num_rsvd_regions;
* caller-specified function is called with the memory ranges that remain after filtering. * caller-specified function is called with the memory ranges that remain after filtering.
* This routine does not assume the incoming segments are sorted. * This routine does not assume the incoming segments are sorted.
*/ */
int int __init
filter_rsvd_memory (unsigned long start, unsigned long end, void *arg) filter_rsvd_memory (unsigned long start, unsigned long end, void *arg)
{ {
unsigned long range_start, range_end, prev_start; unsigned long range_start, range_end, prev_start;
...@@ -177,7 +177,7 @@ filter_rsvd_memory (unsigned long start, unsigned long end, void *arg) ...@@ -177,7 +177,7 @@ filter_rsvd_memory (unsigned long start, unsigned long end, void *arg)
return 0; return 0;
} }
static void static void __init
sort_regions (struct rsvd_region *rsvd_region, int max) sort_regions (struct rsvd_region *rsvd_region, int max)
{ {
int j; int j;
...@@ -218,7 +218,7 @@ __initcall(register_memory); ...@@ -218,7 +218,7 @@ __initcall(register_memory);
* initrd, etc. There are currently %IA64_MAX_RSVD_REGIONS defined, * initrd, etc. There are currently %IA64_MAX_RSVD_REGIONS defined,
* see include/asm-ia64/meminit.h if you need to define more. * see include/asm-ia64/meminit.h if you need to define more.
*/ */
void void __init
reserve_memory (void) reserve_memory (void)
{ {
int n = 0; int n = 0;
...@@ -270,7 +270,7 @@ reserve_memory (void) ...@@ -270,7 +270,7 @@ reserve_memory (void)
* Grab the initrd start and end from the boot parameter struct given us by * Grab the initrd start and end from the boot parameter struct given us by
* the boot loader. * the boot loader.
*/ */
void void __init
find_initrd (void) find_initrd (void)
{ {
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
......
...@@ -97,7 +97,7 @@ find_max_pfn (unsigned long start, unsigned long end, void *arg) ...@@ -97,7 +97,7 @@ find_max_pfn (unsigned long start, unsigned long end, void *arg)
* Find a place to put the bootmap and return its starting address in * Find a place to put the bootmap and return its starting address in
* bootmap_start. This address must be page-aligned. * bootmap_start. This address must be page-aligned.
*/ */
int static int __init
find_bootmap_location (unsigned long start, unsigned long end, void *arg) find_bootmap_location (unsigned long start, unsigned long end, void *arg)
{ {
unsigned long needed = *(unsigned long *)arg; unsigned long needed = *(unsigned long *)arg;
...@@ -141,7 +141,7 @@ find_bootmap_location (unsigned long start, unsigned long end, void *arg) ...@@ -141,7 +141,7 @@ find_bootmap_location (unsigned long start, unsigned long end, void *arg)
* Walk the EFI memory map and find usable memory for the system, taking * Walk the EFI memory map and find usable memory for the system, taking
* into account reserved areas. * into account reserved areas.
*/ */
void void __init
find_memory (void) find_memory (void)
{ {
unsigned long bootmap_size; unsigned long bootmap_size;
...@@ -228,7 +228,7 @@ count_dma_pages (u64 start, u64 end, void *arg) ...@@ -228,7 +228,7 @@ count_dma_pages (u64 start, u64 end, void *arg)
* Set up the page tables. * Set up the page tables.
*/ */
void void __init
paging_init (void) paging_init (void)
{ {
unsigned long max_dma; unsigned long max_dma;
......
...@@ -206,7 +206,7 @@ free_initmem (void) ...@@ -206,7 +206,7 @@ free_initmem (void)
(__init_end - __init_begin) >> 10); (__init_end - __init_begin) >> 10);
} }
void void __init
free_initrd_mem (unsigned long start, unsigned long end) free_initrd_mem (unsigned long start, unsigned long end)
{ {
struct page *page; struct page *page;
...@@ -261,7 +261,7 @@ free_initrd_mem (unsigned long start, unsigned long end) ...@@ -261,7 +261,7 @@ free_initrd_mem (unsigned long start, unsigned long end)
/* /*
* This installs a clean page in the kernel's page table. * This installs a clean page in the kernel's page table.
*/ */
struct page * static struct page * __init
put_kernel_page (struct page *page, unsigned long address, pgprot_t pgprot) put_kernel_page (struct page *page, unsigned long address, pgprot_t pgprot)
{ {
pgd_t *pgd; pgd_t *pgd;
...@@ -411,7 +411,7 @@ ia64_mmu_init (void *my_cpu_data) ...@@ -411,7 +411,7 @@ ia64_mmu_init (void *my_cpu_data)
#ifdef CONFIG_VIRTUAL_MEM_MAP #ifdef CONFIG_VIRTUAL_MEM_MAP
int int __init
create_mem_map_page_table (u64 start, u64 end, void *arg) create_mem_map_page_table (u64 start, u64 end, void *arg)
{ {
unsigned long address, start_page, end_page; unsigned long address, start_page, end_page;
...@@ -519,7 +519,7 @@ ia64_pfn_valid (unsigned long pfn) ...@@ -519,7 +519,7 @@ ia64_pfn_valid (unsigned long pfn)
} }
EXPORT_SYMBOL(ia64_pfn_valid); EXPORT_SYMBOL(ia64_pfn_valid);
int int __init
find_largest_hole (u64 start, u64 end, void *arg) find_largest_hole (u64 start, u64 end, void *arg)
{ {
u64 *max_gap = arg; u64 *max_gap = arg;
...@@ -535,7 +535,7 @@ find_largest_hole (u64 start, u64 end, void *arg) ...@@ -535,7 +535,7 @@ find_largest_hole (u64 start, u64 end, void *arg)
} }
#endif /* CONFIG_VIRTUAL_MEM_MAP */ #endif /* CONFIG_VIRTUAL_MEM_MAP */
static int static int __init
count_reserved_pages (u64 start, u64 end, void *arg) count_reserved_pages (u64 start, u64 end, void *arg)
{ {
unsigned long num_reserved = 0; unsigned long num_reserved = 0;
...@@ -567,7 +567,7 @@ nolwsys_setup (char *s) ...@@ -567,7 +567,7 @@ nolwsys_setup (char *s)
__setup("nolwsys", nolwsys_setup); __setup("nolwsys", nolwsys_setup);
void void __init
mem_init (void) mem_init (void)
{ {
long reserved_pages, codesize, datasize, initsize; long reserved_pages, codesize, datasize, initsize;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment