diff options
author | Chen, Kenneth W <kenneth.w.chen@intel.com> | 2006-03-22 19:54:15 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-03-22 19:54:15 -0500 |
commit | dae2806615c91cd7afa7c4dee65518435e45854a (patch) | |
tree | 6eaf93c19891fba34181d9317ad06c6e91595e9b /arch/ia64/mm | |
parent | 244fd54540806a5e3391d117794105a35815cbb2 (diff) |
[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: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/mm')
-rw-r--r-- | arch/ia64/mm/contig.c | 6 | ||||
-rw-r--r-- | arch/ia64/mm/init.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 8abb9e86d8aa..84fd1c14c8a9 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c | |||
@@ -97,7 +97,7 @@ find_max_pfn (unsigned long start, unsigned long end, void *arg) | |||
97 | * Find a place to put the bootmap and return its starting address in | 97 | * Find a place to put the bootmap and return its starting address in |
98 | * bootmap_start. This address must be page-aligned. | 98 | * bootmap_start. This address must be page-aligned. |
99 | */ | 99 | */ |
100 | int | 100 | static int __init |
101 | find_bootmap_location (unsigned long start, unsigned long end, void *arg) | 101 | find_bootmap_location (unsigned long start, unsigned long end, void *arg) |
102 | { | 102 | { |
103 | unsigned long needed = *(unsigned long *)arg; | 103 | unsigned long needed = *(unsigned long *)arg; |
@@ -141,7 +141,7 @@ find_bootmap_location (unsigned long start, unsigned long end, void *arg) | |||
141 | * Walk the EFI memory map and find usable memory for the system, taking | 141 | * Walk the EFI memory map and find usable memory for the system, taking |
142 | * into account reserved areas. | 142 | * into account reserved areas. |
143 | */ | 143 | */ |
144 | void | 144 | void __init |
145 | find_memory (void) | 145 | find_memory (void) |
146 | { | 146 | { |
147 | unsigned long bootmap_size; | 147 | unsigned long bootmap_size; |
@@ -228,7 +228,7 @@ count_dma_pages (u64 start, u64 end, void *arg) | |||
228 | * Set up the page tables. | 228 | * Set up the page tables. |
229 | */ | 229 | */ |
230 | 230 | ||
231 | void | 231 | void __init |
232 | paging_init (void) | 232 | paging_init (void) |
233 | { | 233 | { |
234 | unsigned long max_dma; | 234 | unsigned long max_dma; |
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 08d94e6bfa18..3748768c787b 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
@@ -206,7 +206,7 @@ free_initmem (void) | |||
206 | (__init_end - __init_begin) >> 10); | 206 | (__init_end - __init_begin) >> 10); |
207 | } | 207 | } |
208 | 208 | ||
209 | void | 209 | void __init |
210 | free_initrd_mem (unsigned long start, unsigned long end) | 210 | free_initrd_mem (unsigned long start, unsigned long end) |
211 | { | 211 | { |
212 | struct page *page; | 212 | struct page *page; |
@@ -261,7 +261,7 @@ free_initrd_mem (unsigned long start, unsigned long end) | |||
261 | /* | 261 | /* |
262 | * This installs a clean page in the kernel's page table. | 262 | * This installs a clean page in the kernel's page table. |
263 | */ | 263 | */ |
264 | struct page * | 264 | static struct page * __init |
265 | put_kernel_page (struct page *page, unsigned long address, pgprot_t pgprot) | 265 | put_kernel_page (struct page *page, unsigned long address, pgprot_t pgprot) |
266 | { | 266 | { |
267 | pgd_t *pgd; | 267 | pgd_t *pgd; |
@@ -411,7 +411,7 @@ ia64_mmu_init (void *my_cpu_data) | |||
411 | 411 | ||
412 | #ifdef CONFIG_VIRTUAL_MEM_MAP | 412 | #ifdef CONFIG_VIRTUAL_MEM_MAP |
413 | 413 | ||
414 | int | 414 | int __init |
415 | create_mem_map_page_table (u64 start, u64 end, void *arg) | 415 | create_mem_map_page_table (u64 start, u64 end, void *arg) |
416 | { | 416 | { |
417 | unsigned long address, start_page, end_page; | 417 | unsigned long address, start_page, end_page; |
@@ -519,7 +519,7 @@ ia64_pfn_valid (unsigned long pfn) | |||
519 | } | 519 | } |
520 | EXPORT_SYMBOL(ia64_pfn_valid); | 520 | EXPORT_SYMBOL(ia64_pfn_valid); |
521 | 521 | ||
522 | int | 522 | int __init |
523 | find_largest_hole (u64 start, u64 end, void *arg) | 523 | find_largest_hole (u64 start, u64 end, void *arg) |
524 | { | 524 | { |
525 | u64 *max_gap = arg; | 525 | u64 *max_gap = arg; |
@@ -535,7 +535,7 @@ find_largest_hole (u64 start, u64 end, void *arg) | |||
535 | } | 535 | } |
536 | #endif /* CONFIG_VIRTUAL_MEM_MAP */ | 536 | #endif /* CONFIG_VIRTUAL_MEM_MAP */ |
537 | 537 | ||
538 | static int | 538 | static int __init |
539 | count_reserved_pages (u64 start, u64 end, void *arg) | 539 | count_reserved_pages (u64 start, u64 end, void *arg) |
540 | { | 540 | { |
541 | unsigned long num_reserved = 0; | 541 | unsigned long num_reserved = 0; |
@@ -567,7 +567,7 @@ nolwsys_setup (char *s) | |||
567 | 567 | ||
568 | __setup("nolwsys", nolwsys_setup); | 568 | __setup("nolwsys", nolwsys_setup); |
569 | 569 | ||
570 | void | 570 | void __init |
571 | mem_init (void) | 571 | mem_init (void) |
572 | { | 572 | { |
573 | long reserved_pages, codesize, datasize, initsize; | 573 | long reserved_pages, codesize, datasize, initsize; |