diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-28 19:09:46 -0400 | 
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-28 19:09:46 -0400 | 
| commit | d719948e623622cf9fc8016f7ec63422d929eb3b (patch) | |
| tree | 3ea5e18a0f6c1b43392d9abc76722095ce179e59 | |
| parent | be379124c0a5abfbe57dab2823fe8a71ce797aee (diff) | |
[IA64] end of kernel 'data' is at _end, not _edata
/proc/iomem describes a block of memory as "Kernel data",
but the end address is derived from "_edata".  The kernel
actually has many other sections beyond _edata.  Get the
real end address from _end.
Acked-by: Khalid Aziz <khalid_aziz@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/kernel/setup.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 83b37c410ccd..3e9b797e6588 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -89,7 +89,7 @@ static struct resource code_resource = { | |||
| 89 | }; | 89 | }; | 
| 90 | extern void efi_initialize_iomem_resources(struct resource *, | 90 | extern void efi_initialize_iomem_resources(struct resource *, | 
| 91 | struct resource *); | 91 | struct resource *); | 
| 92 | extern char _text[], _edata[], _etext[]; | 92 | extern char _text[], _end[], _etext[]; | 
| 93 | 93 | ||
| 94 | unsigned long ia64_max_cacheline_size; | 94 | unsigned long ia64_max_cacheline_size; | 
| 95 | unsigned long ia64_iobase; /* virtual address for I/O accesses */ | 95 | unsigned long ia64_iobase; /* virtual address for I/O accesses */ | 
| @@ -192,7 +192,7 @@ static int __init register_memory(void) | |||
| 192 | code_resource.start = ia64_tpa(_text); | 192 | code_resource.start = ia64_tpa(_text); | 
| 193 | code_resource.end = ia64_tpa(_etext) - 1; | 193 | code_resource.end = ia64_tpa(_etext) - 1; | 
| 194 | data_resource.start = ia64_tpa(_etext); | 194 | data_resource.start = ia64_tpa(_etext); | 
| 195 | data_resource.end = ia64_tpa(_edata) - 1; | 195 | data_resource.end = ia64_tpa(_end) - 1; | 
| 196 | efi_initialize_iomem_resources(&code_resource, &data_resource); | 196 | efi_initialize_iomem_resources(&code_resource, &data_resource); | 
| 197 | 197 | ||
| 198 | return 0; | 198 | return 0; | 
