Messages in this thread Patch in this message | | | From | Magnus Damm <> | Date | Thu, 02 Nov 2006 22:20:53 +0900 | Subject | [PATCH] x86_64: e820.c - end_pfn namespace fixes |
| |
x86_64: e820.c - end_pfn namespace fixes
The functions e820_end_of_ram() and e820_register_active_regions() both use local variables named end_pfn. A global variable with the same name is exported from the same file. This patch renames the local variables to _end_pfn to avoid namespace mistakes.
Signed-off-by: Magnus Damm <magnus@valinux.co.jp> ---
Applies to 2.6.19-rc4.
arch/x86_64/kernel/e820.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
--- 0005/arch/x86_64/kernel/e820.c +++ work/arch/x86_64/kernel/e820.c 2006-11-02 21:44:59.000000000 +0900 @@ -167,20 +167,19 @@ unsigned long __init find_e820_area(unsi */ unsigned long __init e820_end_of_ram(void) { - unsigned long end_pfn = 0; - end_pfn = find_max_pfn_with_active_regions(); + unsigned long _end_pfn = find_max_pfn_with_active_regions(); - if (end_pfn > end_pfn_map) - end_pfn_map = end_pfn; + if (_end_pfn > end_pfn_map) + end_pfn_map = _end_pfn; if (end_pfn_map > MAXMEM>>PAGE_SHIFT) end_pfn_map = MAXMEM>>PAGE_SHIFT; - if (end_pfn > end_user_pfn) - end_pfn = end_user_pfn; - if (end_pfn > end_pfn_map) - end_pfn = end_pfn_map; + if (_end_pfn > end_user_pfn) + _end_pfn = end_user_pfn; + if (_end_pfn > end_pfn_map) + _end_pfn = end_pfn_map; printk("end_pfn_map = %lu\n", end_pfn_map); - return end_pfn; + return _end_pfn; } /* @@ -267,7 +266,7 @@ void __init e820_mark_nosave_regions(voi /* Walk the e820 map and register active regions within a node */ void __init e820_register_active_regions(int nid, unsigned long start_pfn, - unsigned long end_pfn) + unsigned long _end_pfn) { int i; unsigned long ei_startpfn, ei_endpfn; @@ -288,14 +287,14 @@ e820_register_active_regions(int nid, un /* Skip if map is outside the node */ if (ei->type != E820_RAM || ei_endpfn <= start_pfn || - ei_startpfn >= end_pfn) + ei_startpfn >= _end_pfn) continue; /* Check for overlaps */ if (ei_startpfn < start_pfn) ei_startpfn = start_pfn; - if (ei_endpfn > end_pfn) - ei_endpfn = end_pfn; + if (ei_endpfn > _end_pfn) + ei_endpfn = _end_pfn; /* Obey end_user_pfn to save on memmap */ if (ei_startpfn >= end_user_pfn) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |