diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-09-07 18:21:15 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:21:01 -0400 |
commit | 1494177942b23b7094ca291d37e6f6263fa60fdd (patch) | |
tree | 3248808433f4d8c5ca9f11be3ff799a448a23206 /arch/x86/mm/init_64.c | |
parent | efc9eb20b2f5125642fc37a1dbabadc3ce5d321c (diff) |
x86: add early_memremap()
early_ioremap() is also used to map normal memory when constructing
the linear memory mapping. However, since we sometimes need to be able
to distinguish between actual IO mappings and normal memory mappings,
add a early_memremap() call, which maps with PAGE_KERNEL (as opposed
to PAGE_KERNEL_IO for early_ioremap()), and use it when constructing
pagetables.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/init_64.c')
-rw-r--r-- | arch/x86/mm/init_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index dec5c775e92b..5beb89683453 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -313,7 +313,7 @@ static __ref void *alloc_low_page(unsigned long *phys) | |||
313 | if (pfn >= table_top) | 313 | if (pfn >= table_top) |
314 | panic("alloc_low_page: ran out of memory"); | 314 | panic("alloc_low_page: ran out of memory"); |
315 | 315 | ||
316 | adr = early_ioremap(pfn * PAGE_SIZE, PAGE_SIZE); | 316 | adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE); |
317 | memset(adr, 0, PAGE_SIZE); | 317 | memset(adr, 0, PAGE_SIZE); |
318 | *phys = pfn * PAGE_SIZE; | 318 | *phys = pfn * PAGE_SIZE; |
319 | return adr; | 319 | return adr; |