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/kernel/setup.c | |
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/kernel/setup.c')
-rw-r--r-- | arch/ia64/kernel/setup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 340dc0362fe5..eb0793628b8a 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -131,8 +131,8 @@ EXPORT_SYMBOL(ia64_max_iommu_merge_mask); | |||
131 | /* | 131 | /* |
132 | * We use a special marker for the end of memory and it uses the extra (+1) slot | 132 | * We use a special marker for the end of memory and it uses the extra (+1) slot |
133 | */ | 133 | */ |
134 | struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1]; | 134 | struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1] __initdata; |
135 | int num_rsvd_regions; | 135 | int num_rsvd_regions __initdata; |
136 | 136 | ||
137 | 137 | ||
138 | /* | 138 | /* |
@@ -141,7 +141,7 @@ int num_rsvd_regions; | |||
141 | * caller-specified function is called with the memory ranges that remain after filtering. | 141 | * caller-specified function is called with the memory ranges that remain after filtering. |
142 | * This routine does not assume the incoming segments are sorted. | 142 | * This routine does not assume the incoming segments are sorted. |
143 | */ | 143 | */ |
144 | int | 144 | int __init |
145 | filter_rsvd_memory (unsigned long start, unsigned long end, void *arg) | 145 | filter_rsvd_memory (unsigned long start, unsigned long end, void *arg) |
146 | { | 146 | { |
147 | unsigned long range_start, range_end, prev_start; | 147 | unsigned long range_start, range_end, prev_start; |
@@ -177,7 +177,7 @@ filter_rsvd_memory (unsigned long start, unsigned long end, void *arg) | |||
177 | return 0; | 177 | return 0; |
178 | } | 178 | } |
179 | 179 | ||
180 | static void | 180 | static void __init |
181 | sort_regions (struct rsvd_region *rsvd_region, int max) | 181 | sort_regions (struct rsvd_region *rsvd_region, int max) |
182 | { | 182 | { |
183 | int j; | 183 | int j; |
@@ -218,7 +218,7 @@ __initcall(register_memory); | |||
218 | * initrd, etc. There are currently %IA64_MAX_RSVD_REGIONS defined, | 218 | * initrd, etc. There are currently %IA64_MAX_RSVD_REGIONS defined, |
219 | * see include/asm-ia64/meminit.h if you need to define more. | 219 | * see include/asm-ia64/meminit.h if you need to define more. |
220 | */ | 220 | */ |
221 | void | 221 | void __init |
222 | reserve_memory (void) | 222 | reserve_memory (void) |
223 | { | 223 | { |
224 | int n = 0; | 224 | int n = 0; |
@@ -270,7 +270,7 @@ reserve_memory (void) | |||
270 | * Grab the initrd start and end from the boot parameter struct given us by | 270 | * Grab the initrd start and end from the boot parameter struct given us by |
271 | * the boot loader. | 271 | * the boot loader. |
272 | */ | 272 | */ |
273 | void | 273 | void __init |
274 | find_initrd (void) | 274 | find_initrd (void) |
275 | { | 275 | { |
276 | #ifdef CONFIG_BLK_DEV_INITRD | 276 | #ifdef CONFIG_BLK_DEV_INITRD |